lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qeth: Cleanup for cast-type determination.

Browse Source 
Clear separation of cast-type determination (send path) for layer-2
resp. layer-3. Allowing to have inline functions for qeth layer-
discipline.

Signed-off-by: Klaus-Dieter Wacker <kdwacker@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Klaus-Dieter Wacker
2009-08-26 02:01:08 +00:00
committed by David S. Miller
parent e806904057
commit ce73e10ee0
4 changed files with 57 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/s390/net/qeth_l2_main.c
View File

@@ -216,36 +216,16 @@ static void qeth_l2_del_all_mc(struct qeth_card *card)
spin_unlock_bh(&card->mclock);
}
static void qeth_l2_get_packet_type(struct qeth_card *card,
struct qeth_hdr *hdr, struct sk_buff *skb)
static inline int qeth_l2_get_cast_type(struct qeth_card *card,
struct sk_buff *skb)
{
__u16 hdr_mac;
if (!memcmp(skb->data + QETH_HEADER_SIZE,
skb->dev->broadcast, 6)) {
/* broadcast? */
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_BROADCAST;
return;
}
hdr_mac = *((__u16 *)skb->data);
/* tr multicast? */
switch (card->info.link_type) {
case QETH_LINK_TYPE_HSTR:
case QETH_LINK_TYPE_LANE_TR:
if ((hdr_mac == QETH_TR_MAC_NC) ||
(hdr_mac == QETH_TR_MAC_C))
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_MULTICAST;
else
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_UNICAST;
break;
/* eth or so multicast? */
default:
if ((hdr_mac == QETH_ETH_MAC_V4) ||
(hdr_mac == QETH_ETH_MAC_V6))
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_MULTICAST;
else
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_UNICAST;
}
if (card->info.type == QETH_CARD_TYPE_OSN)
return RTN_UNSPEC;
if (is_broadcast_ether_addr(skb->data))
return RTN_BROADCAST;
if (is_multicast_ether_addr(skb->data))
return RTN_MULTICAST;
return RTN_UNSPEC;
}
static void qeth_l2_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
@@ -262,7 +242,7 @@ static void qeth_l2_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
else if (cast_type == RTN_BROADCAST)
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_BROADCAST;
else
qeth_l2_get_packet_type(card, hdr, skb);
hdr->hdr.l2.flags[2] |= QETH_LAYER2_FLAG_UNICAST;
hdr->hdr.l2.pkt_length = skb->len-QETH_HEADER_SIZE;
/* VSWITCH relies on the VLAN
@@ -672,7 +652,7 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct qeth_card *card = dev->ml_priv;
struct sk_buff *new_skb = skb;
int ipv = qeth_get_ip_version(skb);
int cast_type = qeth_get_cast_type(card, skb);
int cast_type = qeth_l2_get_cast_type(card, skb);
struct qeth_qdio_out_q *queue = card->qdio.out_qs
[qeth_get_priority_queue(card, skb, ipv, cast_type)];
int tx_bytes = skb->len;