diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 02:46:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 02:46:01 +0200 |
| commit | 0ed537b5fd18c38b526fd0e6837a00f96aee30c4 (patch) | |
| tree | 01744d89b09aaaaad77696265fb4732ef9a8fc32 /drivers/net/ethernet/sun/niu.c | |
| parent | cpufreq: speedstep-lib: Use monotonic clock (diff) | |
| parent | PM / OPP: Drop unlikely before IS_ERR(_OR_NULL) (diff) | |
| download | linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.tar.xz linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.zip | |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'drivers/net/ethernet/sun/niu.c')
| -rw-r--r-- | drivers/net/ethernet/sun/niu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 0c5842aeb807..ab6051a43134 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -6658,10 +6658,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, struct sk_buff *skb_new; skb_new = skb_realloc_headroom(skb, len); - if (!skb_new) { - rp->tx_errors++; + if (!skb_new) goto out_drop; - } kfree_skb(skb); skb = skb_new; } else |