Commit 86c310ef authored by jan.koester's avatar jan.koester
Browse files

fxed smb cache build

parent dd89c7ba

drivers/net/usb/r8152.c

+6 −7
Original line number Diff line number Diff line
@@ -8277,7 +8277,9 @@ static int rtl8152_pre_reset(struct usb_interface *intf) 
	struct r8152 *tp = usb_get_intfdata(intf);

	struct net_device *netdev;



	if (!tp)

	rtnl_lock();



	if (!tp || !test_bit(PROBED_WITH_NO_ERRORS, &tp->flags))

		return 0;



	netdev = tp->netdev;
@@ -8305,15 +8307,12 @@ static int rtl8152_post_reset(struct usb_interface *intf) 
	struct net_device *netdev;

	struct sockaddr sa;



	if (!tp)

		return 0;

	if (!tp || !test_bit(PROBED_WITH_NO_ERRORS, &tp->flags))

		goto exit;



	/* reset the MAC address in case of policy change */

	if (determine_ethernet_addr(tp, &sa) >= 0) {

		rtnl_lock();

	if (determine_ethernet_addr(tp, &sa) >= 0)

		dev_set_mac_address (tp->netdev, &sa, NULL);

		rtnl_unlock();

	}



	netdev = tp->netdev;

	if (!netif_running(netdev))

drivers/net/usb/r8152.c.rej

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
--- drivers/net/usb/r8152.c

+++ drivers/net/usb/r8152.c

@@ -8378,6 +8400,8 @@ static int rtl8152_pre_reset(struct usb_interface *intf)

 	struct r8152 *tp = usb_get_intfdata(intf);

 	struct net_device *netdev;

 

+	rtnl_lock();

+

 	if (!tp || !test_bit(PROBED_WITH_NO_ERRORS, &tp->flags))

 		return 0;

 

@@ -8409,20 +8433,17 @@ static int rtl8152_post_reset(struct usb_interface *intf)

 	struct sockaddr sa;

 

 	if (!tp || !test_bit(PROBED_WITH_NO_ERRORS, &tp->flags))

-		return 0;

+		goto exit;

 

 	rtl_set_accessible(tp);

 

 	/* reset the MAC address in case of policy change */

-	if (determine_ethernet_addr(tp, &sa) >= 0) {

-		rtnl_lock();

+	if (determine_ethernet_addr(tp, &sa) >= 0)

 		dev_set_mac_address (tp->netdev, &sa, NULL);

-		rtnl_unlock();

-	}

 

 	netdev = tp->netdev;

 	if (!netif_running(netdev))

-		return 0;

+		goto exit;

 

 	set_bit(WORK_ENABLE, &tp->flags);

 	if (netif_carrier_ok(netdev)) {