diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-14 18:59:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-14 19:11:33 -0400 |
commit | e743d31312d00932391b123dfac3324d2b9e8c81 (patch) | |
tree | e5ac3aacbfdde1fe8eb44c4e010085915da5ea05 /drivers/net/e1000 | |
parent | b4bf665c5761837f693e87ab27870a5868185ccc (diff) |
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 47da5fc1e9f4..974a02d81823 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, | |||
2929 | unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD; | 2929 | unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD; |
2930 | unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; | 2930 | unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; |
2931 | unsigned int tx_flags = 0; | 2931 | unsigned int tx_flags = 0; |
2932 | unsigned int len = skb->len - skb->data_len; | 2932 | unsigned int len = skb_headlen(skb); |
2933 | unsigned int nr_frags; | 2933 | unsigned int nr_frags; |
2934 | unsigned int mss; | 2934 | unsigned int mss; |
2935 | int count = 0; | 2935 | int count = 0; |
@@ -2980,7 +2980,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, | |||
2980 | dev_kfree_skb_any(skb); | 2980 | dev_kfree_skb_any(skb); |
2981 | return NETDEV_TX_OK; | 2981 | return NETDEV_TX_OK; |
2982 | } | 2982 | } |
2983 | len = skb->len - skb->data_len; | 2983 | len = skb_headlen(skb); |
2984 | break; | 2984 | break; |
2985 | default: | 2985 | default: |
2986 | /* do nothing */ | 2986 | /* do nothing */ |