summaryrefslogtreecommitdiffstats
path: root/drivers/ieee802154
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-29 09:57:15 +0100
committerDavid S. Miller <davem@davemloft.net>2009-11-29 09:57:15 +0100
commit9b963e5d0e01461099a40117b05480f24b63381f (patch)
tree4756d554e37bf4ab7202f2c564cbe629af98b576 /drivers/ieee802154
parentixgbe: Display currently attached PHY through ethtool (diff)
parentsctp: on T3_RTX retransmit all the in-flight chunks (diff)
downloadlinux-9b963e5d0e01461099a40117b05480f24b63381f.tar.xz
linux-9b963e5d0e01461099a40117b05480f24b63381f.zip
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index 617549f30ef9..5f67540e669c 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;
}