diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
| commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
| tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /net/phonet/pep-gprs.c | |
| parent | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/phonet/pep-gprs.c')
| -rw-r--r-- | net/phonet/pep-gprs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c index 6a91a32a80c..4aa888584d2 100644 --- a/net/phonet/pep-gprs.c +++ b/net/phonet/pep-gprs.c | |||
| @@ -207,7 +207,6 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 207 | dev->name, err); | 207 | dev->name, err); |
| 208 | dev->stats.tx_aborted_errors++; | 208 | dev->stats.tx_aborted_errors++; |
| 209 | dev->stats.tx_errors++; | 209 | dev->stats.tx_errors++; |
| 210 | dev_kfree_skb(skb); | ||
| 211 | } else { | 210 | } else { |
| 212 | dev->stats.tx_packets++; | 211 | dev->stats.tx_packets++; |
| 213 | dev->stats.tx_bytes += len; | 212 | dev->stats.tx_bytes += len; |