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 /arch/um/drivers/daemon_kern.c | |
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 'arch/um/drivers/daemon_kern.c')
-rw-r--r-- | arch/um/drivers/daemon_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c index 9c2e7a758f21..adeece11e596 100644 --- a/arch/um/drivers/daemon_kern.c +++ b/arch/um/drivers/daemon_kern.c | |||
@@ -46,7 +46,7 @@ static int daemon_read(int fd, struct sk_buff **skb, | |||
46 | { | 46 | { |
47 | *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER); | 47 | *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER); |
48 | if(*skb == NULL) return(-ENOMEM); | 48 | if(*skb == NULL) return(-ENOMEM); |
49 | return(net_recvfrom(fd, (*skb)->mac.raw, | 49 | return(net_recvfrom(fd, skb_mac_header(*skb), |
50 | (*skb)->dev->mtu + ETH_HEADER_OTHER)); | 50 | (*skb)->dev->mtu + ETH_HEADER_OTHER)); |
51 | } | 51 | } |
52 | 52 | ||