diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-21 23:32:24 -0700 |
| commit | d3c6e7ad09cebbad1a3dea077668062136626fd2 (patch) | |
| tree | 698022508a8d8c76a5d2cf55e50232079d6b1f42 /net/irda | |
| parent | c3227e546c574172e77616270a16a04eae561b8f (diff) | |
| parent | 48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irlan/irlan_eth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index 9616c32d107..5bb8353105c 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c @@ -169,6 +169,7 @@ static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb, { struct irlan_cb *self = netdev_priv(dev); int ret; + unsigned int len; /* skb headroom large enough to contain all IrDA-headers? */ if ((skb_headroom(skb) < self->max_header_size) || (skb_shared(skb))) { @@ -188,6 +189,7 @@ static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb, dev->trans_start = jiffies; + len = skb->len; /* Now queue the packet in the transport layer */ if (self->use_udata) ret = irttp_udata_request(self->tsap_data, skb); @@ -209,7 +211,7 @@ static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb, self->stats.tx_dropped++; } else { self->stats.tx_packets++; - self->stats.tx_bytes += skb->len; + self->stats.tx_bytes += len; } return NETDEV_TX_OK; |