mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[SK_BUFF]: Introduce skb_network_offset()
For the quite common 'skb->nh.raw - skb->data' sequence. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
e7dd65dafd
commit
bbe735e424
18 changed files with 33 additions and 28 deletions
|
|
@ -1300,7 +1300,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
|
|||
~csum_tcpudp_magic(skb->nh.iph->saddr,
|
||||
skb->nh.iph->daddr, 0,
|
||||
IPPROTO_TCP, 0);
|
||||
ipofst = skb->nh.raw - skb->data;
|
||||
ipofst = skb_network_offset(skb);
|
||||
if (ipofst != ENET_HEADER_SIZE) /* 802.3 frame */
|
||||
tso->tsopl |= 1 << TSO_PARAM_ETHTYPE_SHIFT;
|
||||
|
||||
|
|
|
|||
|
|
@ -1865,7 +1865,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
++st->tx_tso;
|
||||
|
||||
eth_type = skb->nh.raw - skb->data == ETH_HLEN ?
|
||||
eth_type = skb_network_offset(skb) == ETH_HLEN ?
|
||||
CPL_ETH_II : CPL_ETH_II_VLAN;
|
||||
|
||||
hdr = (struct cpl_tx_pkt_lso *)skb_push(skb, sizeof(*hdr));
|
||||
|
|
|
|||
|
|
@ -897,7 +897,7 @@ static void write_tx_pkt_wr(struct adapter *adap, struct sk_buff *skb,
|
|||
d->flit[2] = 0;
|
||||
cntrl |= V_TXPKT_OPCODE(CPL_TX_PKT_LSO);
|
||||
hdr->cntrl = htonl(cntrl);
|
||||
eth_type = skb->nh.raw - skb->data == ETH_HLEN ?
|
||||
eth_type = skb_network_offset(skb) == ETH_HLEN ?
|
||||
CPL_ETH_II : CPL_ETH_II_VLAN;
|
||||
tso_info |= V_LSO_ETH_TYPE(eth_type) |
|
||||
V_LSO_IPHDR_WORDS(skb->nh.iph->ihl) |
|
||||
|
|
|
|||
|
|
@ -2910,7 +2910,7 @@ e1000_tso(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
|
|||
0);
|
||||
ipcse = 0;
|
||||
}
|
||||
ipcss = skb->nh.raw - skb->data;
|
||||
ipcss = skb_network_offset(skb);
|
||||
ipcso = (void *)&(skb->nh.iph->check) - (void *)skb->data;
|
||||
tucss = skb->h.raw - skb->data;
|
||||
tucso = (void *)&(skb->h.th->check) - (void *)skb->data;
|
||||
|
|
|
|||
|
|
@ -952,7 +952,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
|
|||
* frame (skb->data) and the start of the IP hdr.
|
||||
* l4os is the distance between the start of the
|
||||
* l3 hdr and the l4 hdr */
|
||||
fcb->l3os = (u16)(skb->nh.raw - skb->data - GMAC_FCB_LEN);
|
||||
fcb->l3os = (u16)(skb_network_offset(skb) - GMAC_FCB_LEN);
|
||||
fcb->l4os = (u16)(skb->h.raw - skb->nh.raw);
|
||||
|
||||
fcb->flags = flags;
|
||||
|
|
|
|||
|
|
@ -1195,7 +1195,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
|
|||
skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
|
||||
skb->nh.iph->daddr,
|
||||
0, IPPROTO_TCP, 0);
|
||||
ipcss = skb->nh.raw - skb->data;
|
||||
ipcss = skb_network_offset(skb);
|
||||
ipcso = (void *)&(skb->nh.iph->check) - (void *)skb->data;
|
||||
ipcse = skb->h.raw - skb->data - 1;
|
||||
tucss = skb->h.raw - skb->data;
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@ void netxen_tso_check(struct netxen_adapter *adapter,
|
|||
}
|
||||
adapter->stats.xmitcsummed++;
|
||||
desc->tcp_hdr_offset = skb->h.raw - skb->data;
|
||||
desc->ip_hdr_offset = skb->nh.raw - skb->data;
|
||||
desc->ip_hdr_offset = skb_network_offset(skb);
|
||||
}
|
||||
|
||||
int netxen_is_flash_supported(struct netxen_adapter *adapter)
|
||||
|
|
|
|||
Loading…
Reference in a new issue