backports: refresh patches on next-20130920

1   2.6.25              [  OK  ]
2   2.6.26              [  OK  ]
3   2.6.27              [  OK  ]
4   2.6.28              [  OK  ]
5   2.6.29              [  OK  ]
6   2.6.30              [  OK  ]
7   2.6.31              [  OK  ]
8   2.6.32              [  OK  ]
9   2.6.33              [  OK  ]
10  2.6.34              [  OK  ]
11  2.6.35              [  OK  ]
12  2.6.36              [  OK  ]
13  2.6.37              [  OK  ]
14  2.6.38              [  OK  ]
15  2.6.39              [  OK  ]
16  3.0.98              [  OK  ]
17  3.1.10              [  OK  ]
18  3.10.14             [  OK  ]
19  3.11.3              [  OK  ]
20  3.12-rc3            [  OK  ]
21  3.2.51              [  OK  ]
22  3.3.8               [  OK  ]
23  3.4.64              [  OK  ]
24  3.5.7               [  OK  ]
25  3.6.11              [  OK  ]
26  3.7.10              [  OK  ]
27  3.8.13              [  OK  ]
28  3.9.11              [  OK  ]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/alx.patch b/patches/collateral-evolutions/network/0001-netdev_ops/alx.patch
index 465c4deabc144bf640a036c55f996ba0ea459b77..a0eca03d44e23559aa6d61881322930172301862 100644 (file)
--- a/patches/collateral-evolutions/network/0001-netdev_ops/alx.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops/alx.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/atheros/alx/main.c
 +++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -1261,7 +1261,7 @@ static int alx_probe(struct pci_dev *pde
+@@ -1256,7 +1256,7 @@ static int alx_probe(struct pci_dev *pde
                goto out_free_netdev;
        }
  

diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch
index 318cc342412d79827260af7a1025b558faae8d93..d2d6c0d0f34097daa091ce72f1610fbd42646c69 100644 (file)
--- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_alx_main.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/atheros/alx/main.c
 +++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -1401,6 +1401,9 @@ static int alx_resume(struct device *dev
+@@ -1396,6 +1396,9 @@ static int alx_resume(struct device *dev
        return __alx_open(alx, true);
  }
  
@@ -10,7 +10,7 @@
  static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
  #define ALX_PM_OPS      (&alx_pm_ops)
  #else
-@@ -1503,7 +1506,12 @@ static struct pci_driver alx_driver = {
+@@ -1498,7 +1501,12 @@ static struct pci_driver alx_driver = {
        .probe       = alx_probe,
        .remove      = alx_remove,
        .err_handler = &alx_err_handlers,

diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
index 16bcee311217d459bd80a2d577882f892997f3d9..ff615f8f512c1d6fe744fb719f66f3e2776c6361 100644 (file)
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
@@ -14,7 +14,7 @@
  {
        struct sock *sk = sock->sk;
        struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1231,8 +1236,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1237,8 +1242,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -27,7 +27,7 @@
  {
        struct sock *sk;
  
-@@ -1244,7 +1253,11 @@ static int l2cap_sock_create(struct net
+@@ -1250,7 +1259,11 @@ static int l2cap_sock_create(struct net
            sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  

diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
index 8fe9af5b3a4b2a1bd6475a817f954b35cdf1b548..a370d93280ea837f2a13f9ccf9a4db7edf680c3a 100644 (file)
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
@@ -14,7 +14,7 @@
  {
        struct sock *sk;
  
-@@ -661,7 +666,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -666,7 +671,11 @@ static int rfcomm_sock_setsockopt_old(st
        return err;
  }
  

diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
index 742ae0fb4dce6f22514bdba6ae1693550bb79048..5360471af116672f4740497bd3ab4ac478857922 100644 (file)
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
@@ -44,7 +44,7 @@
  #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = alx_poll_controller,
  #endif
-@@ -1303,7 +1317,11 @@ static int alx_probe(struct pci_dev *pde
+@@ -1298,7 +1312,11 @@ static int alx_probe(struct pci_dev *pde
                }
        }
  

diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch
index 2fd4eed93481ef1f1c142c6bb04550694637576a..467d4c6dd1d937c3ca83c9e4895cfeeb05e9fc9e 100644 (file)
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_usb_cdc_ether.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/usb/cdc_ether.c
 +++ b/drivers/net/usb/cdc_ether.c
-@@ -757,7 +757,9 @@ static struct usb_driver cdc_driver = {
+@@ -726,7 +726,9 @@ static struct usb_driver cdc_driver = {
        .resume =       usbnet_resume,
        .reset_resume = usbnet_resume,
        .supports_autosuspend = 1,