From: David S. Miller <davem@davemloft.net>
Date: Thu, 2 Oct 2014 18:25:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.18-rc1~115^2~61
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=739e4a758e0e2930f4bcdddd244254bae8dd7499;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

739e4a758e0e2930f4bcdddd244254bae8dd7499
diff --cc drivers/net/usb/r8152.c
index a4d4c4a1354f,604ef210a4de..b9a98152815b
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -22,11 -22,9 +22,11 @@@
  #include <linux/ip.h>
  #include <linux/ipv6.h>
  #include <net/ip6_checksum.h>
 +#include <uapi/linux/mdio.h>
 +#include <linux/mdio.h>
  
  /* Version Information */
- #define DRIVER_VERSION "v1.06.0 (2014/03/03)"
+ #define DRIVER_VERSION "v1.06.1 (2014/10/01)"
  #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
  #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
  #define MODULENAME "r8152"
@@@ -2080,11 -2067,10 +2097,10 @@@ static void rtl_disable(struct r8152 *t
  	for (i = 0; i < 1000; i++) {
  		if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY)
  			break;
 -		mdelay(1);
 +		usleep_range(1000, 2000);
  	}
  
- 	for (i = 0; i < RTL8152_MAX_RX; i++)
- 		usb_kill_urb(tp->rx_info[i].urb);
+ 	rtl_stop_rx(tp);
  
  	rtl8152_nic_reset(tp);
  }
@@@ -3211,13 -3105,12 +3203,13 @@@ static int rtl8152_resume(struct usb_in
  		} else {
  			tp->rtl_ops.up(tp);
  			rtl8152_set_speed(tp, AUTONEG_ENABLE,
 -				tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
 -				DUPLEX_FULL);
 +					  tp->mii.supports_gmii ?
 +					  SPEED_1000 : SPEED_100,
 +					  DUPLEX_FULL);
+ 			tp->speed = 0;
+ 			netif_carrier_off(tp->netdev);
+ 			set_bit(WORK_ENABLE, &tp->flags);
  		}
- 		tp->speed = 0;
- 		netif_carrier_off(tp->netdev);
- 		set_bit(WORK_ENABLE, &tp->flags);
  		usb_submit_urb(tp->intr_urb, GFP_KERNEL);
  	}
  
diff --cc net/netfilter/nfnetlink.c
index f77d3f7f22b5,f37f0716a9fc..6c5a915cfa75
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@@ -333,7 -380,8 +380,8 @@@ replay
  			 * original skb.
  			 */
  			if (err == -EAGAIN) {
+ 				nfnl_err_reset(&err_list);
 -				ss->abort(skb);
 +				ss->abort(oskb);
  				nfnl_unlock(subsys_id);
  				kfree_skb(nskb);
  				goto replay;
@@@ -357,10 -418,11 +418,11 @@@ ack
  	}
  done:
  	if (success && done)
 -		ss->commit(skb);
 +		ss->commit(oskb);
  	else
 -		ss->abort(skb);
 +		ss->abort(oskb);
  
+ 	nfnl_err_deliver(&err_list, oskb);
  	nfnl_unlock(subsys_id);
  	kfree_skb(nskb);
  }