diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-29 00:57:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 00:57:15 -0800 |
| commit | 9b963e5d0e01461099a40117b05480f24b63381f (patch) | |
| tree | 4756d554e37bf4ab7202f2c564cbe629af98b576 /drivers/ieee802154 | |
| parent | 3b8626ba01a8a745a3fdf22dd347edd708b0af13 (diff) | |
| parent | 5fdd4baef6195a1f2960e901c8877e2105f832ca (diff) | |
| download | kernel_samsung_smdk4412-9b963e5d0e01461099a40117b05480f24b63381f.zip kernel_samsung_smdk4412-9b963e5d0e01461099a40117b05480f24b63381f.tar.gz kernel_samsung_smdk4412-9b963e5d0e01461099a40117b05480f24b63381f.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c
Diffstat (limited to 'drivers/ieee802154')
| -rw-r--r-- | drivers/ieee802154/fakehard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c index 617549f..5f67540 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/ieee802154/fakehard.c @@ -284,13 +284,13 @@ static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb, { skb->skb_iif = dev->ifindex; skb->dev = dev; + dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; - dev->trans_start = jiffies; - /* FIXME: do hardware work here ... */ + dev_kfree_skb(skb); return NETDEV_TX_OK; } |