PATCH: [SKBUFF] introduce skb_set_link_header
Subsystems (19)
Hi David,
Please consider pulling from:
bk://kernel.bkbits.net/acme/sk_buff-2.6
Now there are seven outstanding changesets in this tree.
Best Regards,
- Arnaldo
===================================================================
[email protected], 2004-10-04 00:06:25-03:00, [email protected]
[SKBUFF] introduce skb_set_link_header
Abstracting setting the link layer sk_buff header, there are still some corner cases to handle, will work on those.
This should make the code a bit more understandable and also removes a lot of direct accesses to skb->data.
In the process found several places where foo_type_trans functions can be introduced, next patches will do that (AX.25, for instance).
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by David S. Miller <[email protected]>
arch/um/drivers/net_kern.c | 2 +- drivers/ieee1394/eth1394.c | 2 +- drivers/isdn/i4l/isdn_net.c | 4 ++-- drivers/isdn/i4l/isdn_ppp.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/message/fusion/mptlan.c | 4 ++-- drivers/net/appletalk/cops.c | 2 +- drivers/net/appletalk/ltpc.c | 2 +- drivers/net/arcnet/arc-rawmode.c | 2 +- drivers/net/arcnet/rfc1051.c | 2 +- drivers/net/arcnet/rfc1201.c | 2 +- drivers/net/bonding/bond_3ad.c | 4 ++-- drivers/net/bonding/bond_alb.c | 4 ++-- drivers/net/hamradio/6pack.c | 2 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/bpqether.c | 2 +- drivers/net/hamradio/dmascc.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/mkiss.c | 2 +- drivers/net/hamradio/scc.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/irda/ali-ircc.c | 2 +- drivers/net/irda/au1k_ir.c | 2 +- drivers/net/irda/donauboe.c | 2 +- drivers/net/irda/irda-usb.c | 2 +- drivers/net/irda/nsc-ircc.c | 2 +- drivers/net/irda/sa1100_ir.c | 2 +- drivers/net/irda/smsc-ircc2.c | 2 +- drivers/net/irda/stir4200.c | 2 +- drivers/net/irda/via-ircc.c | 8 ++++---- drivers/net/irda/vlsi_ir.c | 2 +- drivers/net/irda/w83977af_ir.c | 2 +- drivers/net/plip.c | 2 +- drivers/net/ppp_generic.c | 2 +- drivers/net/sb1000.c | 2 +- drivers/net/slip.c | 2 +- drivers/net/tun.c | 2 +- drivers/net/wan/cosa.c | 2 +- drivers/net/wan/dlci.c | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/net/wan/hostess_sv11.c | 4 ++-- drivers/net/wan/lmc/lmc_main.c | 4 ++-- drivers/net/wan/pc300_drv.c | 2 +- drivers/net/wan/pc300_tty.c | 2 +- drivers/net/wan/sdla_chdlc.c | 6 +++--- drivers/net/wan/sdla_fr.c | 6 +++--- drivers/net/wan/sdla_ppp.c | 4 ++-- drivers/net/wan/sdla_x25.c | 12 ++++++------ drivers/net/wan/sealevel.c | 2 +- drivers/net/wan/syncppp.c | 2 +- drivers/net/wan/wanpipe_multppp.c | 6 +++--- drivers/net/wireless/airo.c | 4 ++-- drivers/net/wireless/prism54/islpci_eth.c | 2 +- drivers/net/wireless/strip.c | 2 +- drivers/s390/net/ctcmain.c | 4 ++-- drivers/s390/net/netiucv.c | 4 ++-- drivers/s390/net/qeth_main.c | 6 +++--- include/linux/hdlc.h | 2 +- include/linux/skbuff.h | 5 +++++ net/802/fc.c | 2 +- net/802/fddi.c | 2 +- net/802/hippi.c | 2 +- net/802/tr.c | 2 +- net/atm/clip.c | 2 +- net/bluetooth/bnep/core.c | 2 +- net/bridge/br_device.c | 2 +- net/core/dev.c | 2 +- net/decnet/dn_route.c | 2 +- net/ethernet/eth.c | 4 ++-- net/ipv4/ip_output.c | 2 +- net/ipv4/route.c | 2 +- net/ipv6/ip6_output.c | 2 +- net/ipv6/route.c | 2 +- net/irda/irlap_frame.c | 3 ++- net/irda/wrapper.c | 2 +- net/llc/llc_output.c | 6 ++++-- net/llc/llc_sap.c | 2 +- net/wanrouter/wanmain.c | 2 +- 78 files changed, 113 insertions(+), 105 deletions(-)
arch/um/drivers/net_kern.c +1 -1
@@ -48,7 +48,7 @@ skb->dev = dev;skb_put (skb, dev->mtu); - skb->mac.raw = skb->data; +skb_set_link_header (skb); pkt_len = (*lp->read)(lp->fd, &skb, lp);if (pkt_len >0 ) {
drivers/ieee1394/eth1394.c +1 -1
@@ -848,7 +848,7 @@struct eth1394hdr *eth;unsigned char *rawp; - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,ETH1394_HLEN ); eth =eth1394_hdr (skb);
drivers/isdn/i4l/isdn_net.c +2 -2
@@ -1367,7 +1367,7 @@struct ethhdr *eth;unsigned char *rawp; - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,ETH_HLEN ); eth =eth_hdr (skb);
@@ -1787,7 +1787,7 @@ } skb->dev = ndev; skb->pkt_type =PACKET_HOST ; - skb->mac.raw = skb->data; +skb_set_link_header (skb);#ifdef ISDN_DEBUG_NET_DUMP isdn_dumppkt ("R:" , skb->data, skb->len,40 );#endif
drivers/isdn/i4l/isdn_ppp.c +1 -1
@@ -1178,7 +1178,7 @@ mlp->huptimer =0 ;#endif /* CONFIG_IPPP_FILTER */ skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb);/* net_dev->local->stats.rx_packets++; done in isdn_net.c */ return ;
drivers/media/dvb/dvb-core/dvb_net.c +1 -1
@@ -140,7 +140,7 @@struct ethhdr *eth;unsigned char *rawp; - skb->mac.raw=skb->data; +skb_set_link_header (skb);skb_pull (skb,dev->hard_header_len); eth =eth_hdr (skb);
drivers/message/fusion/mptlan.c +2 -2
@@ -773,7 +773,7 @@/* Set the mac.raw pointer, since this apparently isn't getting * done before we get the skb. Pull the data pointer past the mac data. */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,12 ); dma = pci_map_single(mpt_dev->pcidev, skb->data, skb->len,
@@ -1564,7 +1564,7 @@struct mpt_lan_ohdr *fch = (struct mpt_lan_ohdr *)skb->data;struct fcllc *fcllc; - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,sizeof (struct mpt_lan_ohdr ));if (fch->dtype ==htons (0xffff )) {
drivers/net/appletalk/cops.c +1 -1
@@ -854,7 +854,7 @@return ; } - skb->mac.raw = skb->data;/* Point to entire packet. */ +skb_set_link_header (skb);/* Point to entire packet. */ skb_pull (skb,3 ); skb->h.raw = skb->data;/* Point to data (Skip header). */
drivers/net/appletalk/ltpc.c +1 -1
@@ -770,7 +770,7 @@ skb->data[0 ] = dnode; skb->data[1 ] = snode; skb->data[2 ] = llaptype; - skb->mac.raw = skb->data;/* save pointer to llap header */ +skb_set_link_header (skb);/* save pointer to llap header */ skb_pull (skb,3 );/* copy ddp(s,e)hdr + contents */
drivers/net/arcnet/arc-rawmode.c +1 -1
@@ -109,7 +109,7 @@ pkt = (struct archdr *) skb->data; - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,ARC_HDR_SIZE );/* up to sizeof(pkt->soft) has already been copied from the card */
drivers/net/arcnet/rfc1051.c +1 -1
@@ -91,7 +91,7 @@int hdr_size =ARC_HDR_SIZE +RFC1051_HDR_SIZE ;/* Pull off the arcnet header. */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb, hdr_size);if (pkt->hard.dest ==0 )
drivers/net/arcnet/rfc1201.c +1 -1
@@ -94,7 +94,7 @@int hdr_size =ARC_HDR_SIZE +RFC1201_HDR_SIZE ;/* Pull off the arcnet header. */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb, hdr_size);if (pkt->hard.dest ==0 )
drivers/net/bonding/bond_3ad.c +2 -2
@@ -917,7 +917,7 @@ } skb->dev = slave->dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->nh.raw = skb->data +ETH_HLEN ; skb->protocol =PKT_TYPE_LACPDU ; skb->priority =TC_PRIO_CONTROL ;
@@ -961,7 +961,7 @@skb_reserve (skb,16 ); skb->dev = slave->dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->nh.raw = skb->data +ETH_HLEN ; skb->protocol =PKT_TYPE_LACPDU ;
drivers/net/bonding/bond_alb.c +2 -2
@@ -906,7 +906,7 @@ data =skb_put (skb, size);memcpy (data, &pkt, size); - skb->mac.raw = data; +skb_set_link_header (skb); skb->nh.raw = data +ETH_HLEN ; skb->protocol = pkt.type; skb->priority =TC_PRIO_CONTROL ;
@@ -1284,7 +1284,7 @@u8 *hash_start =NULL ;int res =1 ; - skb->mac.raw = (unsigned char *)skb->data; +skb_set_link_header (skb); eth_data =eth_hdr (skb);/* make sure that the curr_active_slave and the slaves list do
drivers/net/hamradio/6pack.c +1 -1
@@ -429,7 +429,7 @@ *ptr++ = cmd;/* KISS command */ memcpy (ptr, sp->cooked_buf +1 , count); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_AX25 );netif_rx (skb); sp->dev->last_rx = jiffies;
drivers/net/hamradio/baycom_epp.c +1 -1
@@ -624,7 +624,7 @@ *cp++ =0 ;/* KISS kludge */ memcpy (cp, bc->hdlcrx.buf, pktlen -1 ); skb->protocol =htons (ETH_P_AX25 ); - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); dev->last_rx = jiffies; bc->stats.rx_packets++;
drivers/net/hamradio/bpqether.c +1 -1
@@ -215,7 +215,7 @@ skb->dev = dev; skb->protocol =htons (ETH_P_AX25 ); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_HOST ;netif_rx (skb);
drivers/net/hamradio/dmascc.c +1 -1
@@ -1224,7 +1224,7 @@memcpy (&data[1 ], priv->rx_buf[i], cb); skb->dev = priv->dev; skb->protocol =ntohs (ETH_P_AX25 ); - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); priv->dev->last_rx = jiffies; priv->stats.rx_packets++;
drivers/net/hamradio/hdlcdrv.c +1 -1
@@ -179,7 +179,7 @@ *cp++ =0 ;/* KISS kludge */ memcpy (cp, s->hdlcrx.buffer, pkt_len -1 ); skb->protocol =htons (ETH_P_AX25 ); - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); dev->last_rx = jiffies; s->stats.rx_packets++;
drivers/net/hamradio/mkiss.c +1 -1
@@ -336,7 +336,7 @@spin_lock_bh (&ax->buflock);memcpy (skb_put (skb,count), ax->rbuff, count);spin_unlock_bh (&ax->buflock); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_AX25 );netif_rx (skb); ax->dev->last_rx = jiffies;
drivers/net/hamradio/scc.c +1 -1
@@ -1632,7 +1632,7 @@ skb->dev = scc->dev; skb->protocol =htons (ETH_P_AX25 ); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_HOST ;netif_rx (skb);
drivers/net/hamradio/yam.c +1 -1
@@ -527,7 +527,7 @@ *cp++ =0 ;/* KISS kludge */ memcpy (cp, yp->rx_buf, pkt_len -1 ); skb->protocol =htons (ETH_P_AX25 ); - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); dev->last_rx = jiffies; ++yp->stats.rx_packets;
drivers/net/irda/ali-ircc.c +1 -1
@@ -1910,7 +1910,7 @@ self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb); self->netdev->last_rx = jiffies;
drivers/net/irda/au1k_ir.c +1 -1
@@ -607,7 +607,7 @@skb_put (skb, count-2 );memcpy (skb->data, (void *)pDB->vaddr, count-2 ); skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb); prxd->count_0 =0 ;
drivers/net/irda/donauboe.c +1 -1
@@ -1298,7 +1298,7 @@ self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA ); }else
drivers/net/irda/irda-usb.c +1 -1
@@ -830,7 +830,7 @@/* Ask the networking layer to queue the packet for the IrDA stack */ dataskb->dev = self->netdev; - dataskb->mac.raw = dataskb->data; +skb_set_link_header (dataskb); dataskb->protocol =htons (ETH_P_IRDA );netif_rx (dataskb);
drivers/net/irda/nsc-ircc.c +1 -1
@@ -1732,7 +1732,7 @@ self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb); self->netdev->last_rx = jiffies;
drivers/net/irda/sa1100_ir.c +1 -1
@@ -570,7 +570,7 @@skb_put (skb, len); skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA ); si->stats.rx_packets++; si->stats.rx_bytes += len;
drivers/net/irda/smsc-ircc2.c +1 -1
@@ -1344,7 +1344,7 @@ self->stats.rx_bytes += len; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb); }
drivers/net/irda/stir4200.c +1 -1
@@ -368,7 +368,7 @@skb_put (skb, len); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA ); skb->dev = stir->netdev;
drivers/net/irda/via-ircc.c +4 -4
@@ -1079,7 +1079,7 @@ self->stats.rx_bytes += len; self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb);return TRUE;
@@ -1163,7 +1163,7 @@ self->stats.rx_bytes += len; self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb);
@@ -1205,7 +1205,7 @@ self->stats.rx_bytes += len; self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb);if (st_fifo->len < (MAX_RX_WINDOW +2 )) {
@@ -1275,7 +1275,7 @@ self->stats.rx_bytes += len; self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb); }//while
drivers/net/irda/vlsi_ir.c +1 -1
@@ -596,7 +596,7 @@ rd->skb =NULL ; skb->dev = ndev;memcpy (skb_put (skb,len), rd->buf, len); - skb->mac.raw = skb->data; +skb_set_link_header (skb);if (in_interrupt ())netif_rx (skb);else
drivers/net/irda/w83977af_ir.c +1 -1
@@ -920,7 +920,7 @@ self->stats.rx_packets++; skb->dev = self->netdev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA );netif_rx (skb); self->netdev->last_rx = jiffies;
drivers/net/plip.c +1 -1
@@ -545,7 +545,7 @@struct ethhdr *eth;unsigned char *rawp; - skb->mac.raw=skb->data; +skb_set_link_header (skb);skb_pull (skb,dev->hard_header_len); eth =eth_hdr (skb);
drivers/net/ppp_generic.c +1 -1
@@ -1594,7 +1594,7 @@skb_pull (skb,2 );/* chop off protocol */ skb->dev = ppp->dev; skb->protocol =htons (npindex_to_ethertype[npi]); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->input_dev = ppp->dev;netif_rx (skb); ppp->dev->last_rx = jiffies;
drivers/net/sb1000.c +1 -1
@@ -842,7 +842,7 @@ goto dropped_frame; } skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol = (unsigned short ) buffer[NewDatagramHeaderSkip +16 ];insw (ioaddr,skb_put (skb, NewDatagramDataSize), NewDatagramDataSize /2 );
drivers/net/slip.c +1 -1
@@ -374,7 +374,7 @@ } skb->dev = sl->dev;memcpy (skb_put (skb,count), sl->rbuff, count); - skb->mac.raw=skb->data; +skb_set_link_header (skb); skb->protocol=htons (ETH_P_IP );netif_rx (skb); sl->dev->last_rx = jiffies;
drivers/net/tun.c +1 -1
@@ -196,7 +196,7 @@ skb->dev = tun->dev;switch (tun->flags &TUN_TYPE_MASK ) {case TUN_TUN_DEV : - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol = pi.proto;break ;case TUN_TAP_DEV :
drivers/net/wan/cosa.c +1 -1
@@ -787,7 +787,7 @@ } chan->rx_skb->protocol =htons (ETH_P_WAN_PPP ); chan->rx_skb->dev = chan->pppdev.dev; - chan->rx_skb->mac.raw = chan->rx_skb->data; +skb_set_link_header (chan->rx_skb); chan->stats.rx_packets++; chan->stats.rx_bytes += chan->cosa->rxsize;netif_rx (chan->rx_skb);
drivers/net/wan/dlci.c +1 -1
@@ -177,7 +177,7 @@if (process) {/* we've set up the protocol, so discard the header */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb, header); dlp->stats.rx_bytes += skb->len;netif_rx (skb);
drivers/net/wan/farsync.c +1 -1
@@ -864,7 +864,7 @@ struct net_device *dev) { skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_HOST ;return htons (ETH_P_CUST ); }
drivers/net/wan/hostess_sv11.c +2 -2
@@ -57,8 +57,8 @@ {/* Drop the CRC - it's not a good idea to try and negotiate it ;) */ skb_trim (skb, skb->len-2 ); - skb->protocol=__constant_htons (ETH_P_WAN_PPP ); - skb->mac.raw=skb->data; + skb->protocol =htons (ETH_P_WAN_PPP ); +skb_set_link_header (skb); skb->dev=c->netdevice;/* * Send it to the PPP layer. We don't have time to process
drivers/net/wan/lmc/lmc_main.c +2 -2
@@ -1673,7 +1673,7 @@skb_put (skb, len); skb->protocol =lmc_proto_type (sc, skb); skb->protocol =htons (ETH_P_WAN_PPP ); - skb->mac.raw = skb->data; +skb_set_link_header (skb);// skb->nh.raw = skb->data; skb->dev = dev;lmc_proto_netif (sc, skb);
@@ -1711,7 +1711,7 @@memcpy (skb_put (nsb, len), skb->data, len); nsb->protocol =lmc_proto_type (sc, skb); - nsb->mac.raw = nsb->data; +skb_set_link_header (nsb);// nsb->nh.raw = nsb->data; nsb->dev = dev;lmc_proto_netif (sc, nsb);
drivers/net/wan/pc300_drv.c +1 -1
@@ -1754,7 +1754,7 @@ skb->dev = dev; skb->protocol =htons (ETH_P_CUST ); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_HOST ; skb->len =10 + skb_main->len;
drivers/net/wan/pc300_tty.c +1 -1
@@ -1026,7 +1026,7 @@skb_put (skb,10 + len); skb->dev = dev->dev; skb->protocol =htons (ETH_P_CUST ); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_HOST ; skb->len =10 + len;
drivers/net/wan/sdla_chdlc.c +3 -3
@@ -2037,7 +2037,7 @@ api_rx_hdr->time_stamp = rxbuf->time_stamp; skb->protocol =htons (PVC_PROT ); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->dev = dev; skb->pkt_type =WAN_PACKET_DATA ;
@@ -2054,7 +2054,7 @@/* Pass it up the protocol stack */ skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); dev->last_rx = jiffies; }
@@ -3058,7 +3058,7 @@/* Decapsulate pkt and pass it up the protocol stack */ new_skb->protocol =htons (ETH_P_IP ); new_skb->dev = dev; - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb);netif_rx (new_skb); dev->last_rx = jiffies;
drivers/net/wan/sdla_fr.c +3 -3
@@ -2097,7 +2097,7 @@ api_rx_hdr->time_stamp = frbuf->tmstamp; skb->protocol =htons (ETH_P_IP ); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->dev = dev; skb->pkt_type =WAN_PACKET_DATA ;
@@ -2170,7 +2170,7 @@ ++card->wandev.stats.rx_errors; goto rx_done; } - skb->mac.raw = skb->data; +skb_set_link_header (skb); }
@@ -3901,7 +3901,7 @@ UDP_PIPE_mgmt_passed_to_stack ++; new_skb->dev = dev; new_skb->protocol =htons (ETH_P_IP ); - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb);netif_rx (new_skb); }else {
drivers/net/wan/sdla_ppp.c +2 -2
@@ -1756,7 +1756,7 @@ }else {/* Pass data up the protocol stack */ skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb); ++card->wandev.stats.rx_packets; card->wandev.stats.rx_bytes += skb->len;
@@ -2756,7 +2756,7 @@stack */ new_skb->protocol =htons (ETH_P_IP ); new_skb->dev = dev; - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb);netif_rx (new_skb); dev->last_rx = jiffies;
drivers/net/wan/sdla_x25.c +6 -6
@@ -1766,7 +1766,7 @@ ++chan->rx_intr_stat.rx_intr_bfr_not_passed_to_stack; } }else { - skb->mac.raw = skb->data; +skb_set_link_header (skb); chan->ifstats.rx_bytes += skb->len; ++chan->ifstats.rx_packets; ++chan->rx_intr_stat.rx_intr_bfr_passed_to_stack;
@@ -1858,7 +1858,7 @@ new_skb->dev = dev;if (chan->common.usedby ==API ){ - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb); new_skb->protocol =htons (X25_PROT ); new_skb->pkt_type =WAN_PACKET_DATA ; }else {
@@ -4658,7 +4658,7 @@memcpy (skb_put (skb,len),&mbox->cmd,len); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (X25_PROT ); skb->pkt_type =WAN_PACKET_ASYNC ;
@@ -4716,7 +4716,7 @@memcpy (skb_put (skb,len),&mbox->cmd.command,len); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =WAN_PACKET_CMD ; chan->common.func (skb,dev,chan->common.sk);
@@ -4826,7 +4826,7 @@memcpy (api_hdr->data,mbox->data,mbox->cmd.length); } - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =WAN_PACKET_ERR ;if (chan->common.func (skb,dev,chan->common.sk) <0 ){
@@ -5193,7 +5193,7 @@else new_skb->protocol =htons (ETH_P_IP ); - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb);netif_rx (new_skb); ++chan->pipe_mgmt_stat.UDP_PIPE_mgmt_passed_to_stack;
drivers/net/wan/sealevel.c +1 -1
@@ -60,7 +60,7 @@/* Drop the CRC - it's not a good idea to try and negotiate it ;) */ skb_trim (skb, skb->len-2 ); skb->protocol=htons (ETH_P_WAN_PPP ); - skb->mac.raw=skb->data; +skb_set_link_header (skb); skb->dev=c->netdevice;/* * Send it to the PPP layer. We don't have time to process
drivers/net/wan/syncppp.c +1 -1
@@ -228,7 +228,7 @@unsigned long flags; skb->dev=dev; - skb->mac.raw=skb->data; +skb_set_link_header (skb);if (dev->flags &IFF_RUNNING ) {
drivers/net/wan/wanpipe_multppp.c +3 -3
@@ -1455,7 +1455,7 @@ }else {/* Pass it up the protocol stack */ skb->dev = dev; - skb->mac.raw = skb->data; +skb_set_link_header (skb);netif_rx (skb); dev->last_rx = jiffies; }
@@ -2056,7 +2056,7 @@/* Decapsulate pkt and pass it up the protocol stack */ new_skb->protocol =htons (ETH_P_IP ); new_skb->dev = dev; - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb);netif_rx (new_skb); dev->last_rx = jiffies;
@@ -2344,7 +2344,7 @@/* Decapsulate pkt and pass it up the protocol stack */ new_skb->protocol =htons (ETH_P_WAN_PPP ); new_skb->dev = dev; - new_skb->mac.raw = new_skb->data; +skb_set_link_header (new_skb);netif_rx (new_skb); dev->last_rx = jiffies;
drivers/net/wireless/airo.c +2 -2
@@ -3255,7 +3255,7 @@OUT4500 ( apriv,EVACK ,EV_RX );if (test_bit (FLAG_802_11 , &apriv->flags)) { - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_OTHERHOST ; skb->dev = apriv->wifidev; skb->protocol =htons (ETH_P_802_2 );
@@ -3595,7 +3595,7 @@ wireless_spy_update(ai->dev, sa, &wstats); }#endif /* IW_WIRELESS_SPY */ - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->pkt_type =PACKET_OTHERHOST ; skb->dev = ai->wifidev; skb->protocol =htons (ETH_P_802_2 );
drivers/net/wireless/prism54/islpci_eth.c +1 -1
@@ -312,7 +312,7 @@skb_pull (*skb,sizeof (struct rfmon_header )); (*skb)->protocol =htons (ETH_P_802_2 ); - (*skb)->mac.raw = (*skb)->data; +skb_set_link_header (*skb); (*skb)->pkt_type =PACKET_OTHERHOST ;return 0 ;
drivers/net/wireless/strip.c +1 -1
@@ -2020,7 +2020,7 @@ packetlen); skb->dev =get_strip_dev (strip_info); skb->protocol = header->protocol; - skb->mac.raw = skb->data; +skb_set_link_header (skb);/* Having put a fake header on the front of the sk_buff for the */ /* benefit of tools like tcpdump, skb_pull now 'consumes' that */
drivers/s390/net/ctcmain.c +2 -2
@@ -699,7 +699,7 @@return ; }skb_put (pskb, header->length); - pskb->mac.raw = pskb->data; +skb_set_link_header (pskb); len -= header->length; skb =dev_alloc_skb (pskb->len);if (!skb) {
@@ -717,7 +717,7 @@return ; }memcpy (skb_put (skb, pskb->len), pskb->data, pskb->len); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->dev = pskb->dev; skb->protocol = pskb->protocol; pskb->ip_summed =CHECKSUM_UNNECESSARY ;
drivers/s390/net/netiucv.c +2 -2
@@ -565,7 +565,7 @@return ; }skb_put (pskb, header->next); - pskb->mac.raw = pskb->data; +skb_set_link_header (pskb); skb =dev_alloc_skb (pskb->len);if (!skb) { PRINT_WARN("%s Out of memory in netiucv_unpack_skb\n",
@@ -576,7 +576,7 @@return ; }memcpy (skb_put (skb, pskb->len), pskb->data, pskb->len); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->dev = pskb->dev; skb->protocol = pskb->protocol; pskb->ip_summed =CHECKSUM_UNNECESSARY ;
drivers/s390/net/qeth_main.c +3 -3
@@ -2146,7 +2146,7 @@return tr_type_trans (skb,dev);#endif /* CONFIG_TR */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,ETH_ALEN *2 +sizeof (short )); eth =eth_hdr (skb);
@@ -2175,7 +2175,7 @@QETH_DBF_TEXT (trace,5 ,"skbfake" ); skb->mac.raw = skb->data -QETH_FAKE_LL_LEN ;/* this is a fake ethernet header */ - fake_hdr = (struct ethhdr *) skb->mac.raw; + fake_hdr =eth_hdr (skb);/* the destination MAC address */ switch (skb->pkt_type){
@@ -2262,7 +2262,7 @@if (card->options.fake_ll)qeth_rebuild_skb_fake_ll (card, skb, hdr);else - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->ip_summed = card->options.checksum_type;if (card->options.checksum_type ==HW_CHECKSUMMING ){ if ( (hdr->ext_flags &
include/linux/hdlc.h +1 -1
@@ -245,7 +245,7 @@ {hdlc_device *hdlc =dev_to_hdlc (dev); - skb->mac.raw = skb->data; +skb_set_link_header (skb); skb->dev = dev;if (hdlc->proto.type_trans)
include/linux/skbuff.h +5 -0
@@ -290,6 +290,11 @@#include <asm/system.h> +static inline void skb_set_link_header (struct sk_buff *skb) +{ + skb->mac.raw = skb->data; +} +extern void __kfree_skb (struct sk_buff *skb);extern struct sk_buff *alloc_skb (unsigned int size,int priority);extern void kfree_skbmem (struct sk_buff *skb);
net/802/fc.c +1 -1
@@ -102,7 +102,7 @@struct fch_hdr *fch = (struct fch_hdr *)skb->data;struct fcllc *fcllc; - skb->mac.raw = skb->data; +skb_set_link_header (skb); fcllc = (struct fcllc *)(skb->data +sizeof (struct fch_hdr ) +2 );skb_pull (skb,sizeof (struct fch_hdr ) +2 );
net/802/fddi.c +1 -1
@@ -131,7 +131,7 @@* to start of packet data. Assume 802.2 SNAP frames for now. */ - skb->mac.raw = skb->data;/* point to frame control (FC) */ +skb_set_link_header (skb);/* point to frame control (FC) */ if (fddi->hdr.llc_8022_1.dsap==0xe0 ) {
net/802/hippi.c +1 -1
@@ -143,7 +143,7 @@* This is actually wrong ... question is if we really should * set the raw address here. */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,HIPPI_HLEN );/*
net/802/tr.c +1 -1
@@ -193,7 +193,7 @@struct trllc *trllc;unsigned riflen=0 ; - skb->mac.raw = skb->data; +skb_set_link_header (skb);if (trh->saddr[0 ] &TR_RII ) riflen = (ntohs (trh->rcf) &TR_RCF_LEN_MASK ) >>8 ;
net/atm/clip.c +1 -1
@@ -211,7 +211,7 @@return ; }ATM_SKB (skb)->vcc = vcc; - skb->mac.raw = skb->data; +skb_set_link_header (skb);if (!clip_vcc->encap || skb->len <RFC1483LLC_LEN ||memcmp (skb->data, llc_oui,sizeof (llc_oui))) skb->protocol =htons (ETH_P_IP );else {
net/bluetooth/bnep/core.c +1 -1
@@ -326,7 +326,7 @@return 0 ; } - skb->mac.raw = skb->data; +skb_set_link_header (skb);/* Verify and pull out header */ if (!skb_pull (skb, __bnep_rx_hlen[type &BNEP_TYPE_MASK ]))
net/bridge/br_device.c +1 -1
@@ -37,7 +37,7 @@ br->statistics.tx_packets++; br->statistics.tx_bytes += skb->len; - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_pull (skb,ETH_HLEN );rcu_read_lock ();
net/core/dev.c +1 -1
@@ -1083,7 +1083,7 @@set by sender, so that the second statement is just protection against buggy protocols. */ - skb2->mac.raw = skb2->data; +skb_set_link_header (skb2);if (skb2->nh.raw < skb2->data || skb2->nh.raw > skb2->tail) {
net/decnet/dn_route.c +1 -1
@@ -1555,7 +1555,7 @@ skb =alloc_skb (NLMSG_GOODSIZE ,GFP_KERNEL );if (skb ==NULL )return -ENOBUFS ; - skb->mac.raw = skb->data; +skb_set_link_header (skb); cb =DN_SKB_CB (skb);if (rta[RTA_SRC -1 ])
net/ethernet/eth.c +2 -2
@@ -161,8 +161,8 @@struct ethhdr *eth;unsigned char *rawp; - skb->mac.raw=skb->data; -skb_pull (skb,ETH_HLEN ); +skb_set_link_header (skb); +skb_pull (skb,ETH_HLEN ); eth =eth_hdr (skb); skb->input_dev = dev;
net/ipv4/ip_output.c +1 -1
@@ -102,7 +102,7 @@/* dev_loopback_xmit for use with netfilter. */ static int ip_dev_loopback_xmit (struct sk_buff *newskb) { - newskb->mac.raw = newskb->data; +skb_set_link_header (newskb);__skb_pull (newskb, newskb->nh.raw - newskb->data); newskb->pkt_type =PACKET_LOOPBACK ; newskb->ip_summed =CHECKSUM_UNNECESSARY ;
net/ipv4/route.c +1 -1
@@ -2351,7 +2351,7 @@/* Reserve room for dummy headers, this skb can pass through good chunk of routing engine. */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_reserve (skb,MAX_HEADER +sizeof (struct iphdr ));if (rta[RTA_SRC -1 ])
net/ipv6/ip6_output.c +1 -1
@@ -97,7 +97,7 @@/* dev_loopback_xmit for use with netfilter. */ static int ip6_dev_loopback_xmit (struct sk_buff *newskb) { - newskb->mac.raw = newskb->data; +skb_set_link_header (newskb);__skb_pull (newskb, newskb->nh.raw - newskb->data); newskb->pkt_type =PACKET_LOOPBACK ; newskb->ip_summed =CHECKSUM_UNNECESSARY ;
net/ipv6/route.c +1 -1
@@ -1763,7 +1763,7 @@/* Reserve room for dummy headers, this skb can pass through good chunk of routing engine. */ - skb->mac.raw = skb->data; +skb_set_link_header (skb);skb_reserve (skb,MAX_HEADER +sizeof (struct ipv6hdr ));memset (&fl,0 ,sizeof (fl));
net/irda/irlap_frame.c +2 -1
@@ -90,7 +90,8 @@ {/* Some common init stuff */ skb->dev = self->netdev; - skb->h.raw = skb->nh.raw = skb->mac.raw = skb->data; + skb->h.raw = skb->nh.raw = skb->data; +skb_set_link_header (skb); skb->protocol =htons (ETH_P_IRDA ); skb->priority =TC_PRIO_BESTEFFORT ;
net/irda/wrapper.c +1 -1
@@ -252,7 +252,7 @@/* Feed it to IrLAP layer */ dataskb->dev = dev; - dataskb->mac.raw = dataskb->data; +skb_set_link_header (dataskb); dataskb->protocol =htons (ETH_P_IRDA );netif_rx (dataskb);
net/llc/llc_output.c +4 -2
@@ -40,7 +40,8 @@struct net_device *dev = skb->dev;struct trh_hdr *trh; - skb->mac.raw =skb_push (skb,sizeof (*trh)); +skb_push (skb,sizeof (*trh)); +skb_set_link_header (skb); trh =tr_hdr (skb); trh->ac =AC ; trh->fc =LLC_FRAME ;
@@ -60,7 +61,8 @@unsigned short len = skb->len;struct ethhdr *eth; - skb->mac.raw =skb_push (skb,sizeof (*eth)); +skb_push (skb,sizeof (*eth)); +skb_set_link_header (skb); eth =eth_hdr (skb); eth->h_proto =htons (len);memcpy (eth->h_dest, da,ETH_ALEN );
net/llc/llc_sap.c +1 -1
@@ -35,11 +35,11 @@struct sk_buff *skb =alloc_skb (128 ,GFP_ATOMIC );if (skb) { +skb_set_link_header (skb);skb_reserve (skb,50 ); skb->nh.raw = skb->h.raw = skb->data; skb->protocol =htons (ETH_P_802_2 ); skb->dev = dev_base->next; - skb->mac.raw = skb->head; }return skb; }
net/wanrouter/wanmain.c +1 -1
@@ -394,7 +394,7 @@ skb->protocol = ethertype; skb->pkt_type =PACKET_HOST ;/* Physically point to point */ skb_pull (skb, cnt); - skb->mac.raw = skb->data; +skb_set_link_header (skb);return ethertype; }