PATCH: [SKBUFF] do some more skb_set_link_header conversions
Subsystems (4)
Hi David,
Please consider pulling from:
bk://kernel.bkbits.net/acme/sk_buff-2.6
Now there are eight outstanding changesets in this tree.
- Arnaldo
===================================================================
[email protected], 2004-10-04 00:28:19-03:00, [email protected]
[SKBUFF] do some more skb_set_link_header conversions
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by David S. Miller <[email protected]>
drivers/net/wan/cycx_x25.c | 2 +- include/net/x25device.h | 2 +- net/802/fddi.c | 2 +- net/bridge/br_stp_bpdu.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/wan/cycx_x25.c +1 -1
@@ -837,7 +837,7 @@ ++chan->ifstats.rx_packets; chan->ifstats.rx_bytes += pktlen; - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); dev->last_rx = jiffies;/* timestamp */ }
include/net/x25device.h +1 -1
@@ -8,7 +8,7 @@static inline unsigned short x25_type_trans (struct sk_buff *skb,struct net_device *dev) { - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->input_dev = skb->dev = dev; skb->pkt_type =PACKET_HOST ;
net/802/fddi.c +1 -1
@@ -127,7 +127,7 @@unsigned short type;/* -* Set mac.raw field to point to FC byte, set data field to point +* Set link header field to point to FC byte, set data field to point * to start of packet data. Assume 802.2 SNAP frames for now. */
net/bridge/br_stp_bpdu.c +2 -1
@@ -44,7 +44,8 @@ skb->dev = dev; skb->protocol =htons (ETH_P_802_2 ); - skb->mac.raw =skb_put (skb, size); +skb_set_link_header (skb); +skb_put (skb, size);memcpy (skb->mac.raw, bridge_ula,ETH_ALEN );memcpy (skb->mac.raw+ETH_ALEN , dev->dev_addr,ETH_ALEN ); skb->mac.raw[2 *ETH_ALEN ] =0 ;