diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-14 15:59:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 16:11:33 -0700 |
| commit | e743d31312d00932391b123dfac3324d2b9e8c81 (patch) | |
| tree | e5ac3aacbfdde1fe8eb44c4e010085915da5ea05 /drivers/net/e1000 | |
| parent | b4bf665c5761837f693e87ab27870a5868185ccc (diff) | |
| download | kernel_samsung_smdk4412-e743d31312d00932391b123dfac3324d2b9e8c81.zip kernel_samsung_smdk4412-e743d31312d00932391b123dfac3324d2b9e8c81.tar.gz kernel_samsung_smdk4412-e743d31312d00932391b123dfac3324d2b9e8c81.tar.bz2 | |
drivers: net: use skb_headlen()
replaces (skb->len - skb->data_len) occurrences by skb_headlen(skb)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 47da5fc..974a02d 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -2929,7 +2929,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD; unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; unsigned int tx_flags = 0; - unsigned int len = skb->len - skb->data_len; + unsigned int len = skb_headlen(skb); unsigned int nr_frags; unsigned int mss; int count = 0; @@ -2980,7 +2980,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, dev_kfree_skb_any(skb); return NETDEV_TX_OK; } - len = skb->len - skb->data_len; + len = skb_headlen(skb); break; default: /* do nothing */ |