diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /drivers/net/veth.c | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index f9f0730b53d5..5ec542dd5b50 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
| @@ -187,7 +187,6 @@ tx_drop: | |||
| 187 | return NETDEV_TX_OK; | 187 | return NETDEV_TX_OK; |
| 188 | 188 | ||
| 189 | rx_drop: | 189 | rx_drop: |
| 190 | kfree_skb(skb); | ||
| 191 | rcv_stats->rx_dropped++; | 190 | rcv_stats->rx_dropped++; |
| 192 | return NETDEV_TX_OK; | 191 | return NETDEV_TX_OK; |
| 193 | } | 192 | } |