diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-19 18:33:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:41 -0400 |
| commit | 98e399f82ab3a6d863d1d4a7ea48925cc91c830e (patch) | |
| tree | 5f84043aeec1ec27c2e8e6cc25b5d2e6c3d07343 /net/tipc | |
| parent | 31713c333ddbb66d694829082620b69b71c4b09a (diff) | |
[SK_BUFF]: Introduce skb_mac_header()
For the places where we need a pointer to the mac header, it is still legal to
touch skb->mac.raw directly if just adding to, subtracting from or setting it
to another layer header.
This one also converts some more cases to skb_reset_mac_header() that my
regex missed as it had no spaces before nor after '=', ugh.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/eth_media.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c index f71ba9db611e..03a9db364538 100644 --- a/net/tipc/eth_media.c +++ b/net/tipc/eth_media.c | |||
| @@ -99,8 +99,8 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev, | |||
| 99 | 99 | ||
| 100 | if (likely(eb_ptr->bearer)) { | 100 | if (likely(eb_ptr->bearer)) { |
| 101 | if (likely(!dev->promiscuity) || | 101 | if (likely(!dev->promiscuity) || |
| 102 | !memcmp(buf->mac.raw,dev->dev_addr,ETH_ALEN) || | 102 | !memcmp(skb_mac_header(buf), dev->dev_addr, ETH_ALEN) || |
| 103 | !memcmp(buf->mac.raw,dev->broadcast,ETH_ALEN)) { | 103 | !memcmp(skb_mac_header(buf), dev->broadcast, ETH_ALEN)) { |
| 104 | size = msg_size((struct tipc_msg *)buf->data); | 104 | size = msg_size((struct tipc_msg *)buf->data); |
| 105 | skb_trim(buf, size); | 105 | skb_trim(buf, size); |
| 106 | if (likely(buf->len == size)) { | 106 | if (likely(buf->len == size)) { |