summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-09 15:47:01 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-09 15:47:01 +0000
commit249fcbf24ca765a045c1d3e8e473fa7b98119340 (patch)
treef0dbe70dbabb6b8c34faab6e2dccf76a567ca139 /target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch
parent46f41f4e05972b492338eefd851af1d20ee24130 (diff)
kernel: backport switch user API changes after r36283
3.3 and 3.6 kernels do not make use of the UAPI headers, still they need to provide an up-to-date switch.h copy for swconfig to build. Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36295 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch')
-rw-r--r--target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch b/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch
index e465f90e7..5fca538be 100644
--- a/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch
+++ b/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch
@@ -1,7 +1,7 @@
reverted:
--- a/drivers/net/phy/swconfig.c
+++ b/drivers/net/phy/swconfig.c
-@@ -376,7 +376,7 @@ swconfig_dump_attr(struct swconfig_callb
+@@ -377,7 +377,7 @@ swconfig_dump_attr(struct swconfig_callb
int id = cb->args[0];
void *hdr;
@@ -10,7 +10,7 @@ reverted:
NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
if (IS_ERR(hdr))
return -1;
-@@ -798,7 +798,7 @@ swconfig_get_attr(struct sk_buff *skb, s
+@@ -799,7 +799,7 @@ swconfig_get_attr(struct sk_buff *skb, s
if (!msg)
goto error;
@@ -19,7 +19,7 @@ reverted:
0, cmd);
if (IS_ERR(hdr))
goto nla_put_failure;
-@@ -883,7 +883,7 @@ static int swconfig_dump_switches(struct
+@@ -902,7 +902,7 @@ static int swconfig_dump_switches(struct
list_for_each_entry(dev, &swdevs, dev_list) {
if (++idx <= start)
continue;