Changeset 36295


Ignore:
Timestamp:
2013-04-09T17:47:01+02:00 (5 years ago)
Author:
florian
Message:

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@…>

Location:
trunk/target/linux/generic
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.3/a02-swconfig-revert-portid-snd_portid-usage.patch

    r34288 r36295  
    22--- a/drivers/net/phy/swconfig.c 
    33+++ b/drivers/net/phy/swconfig.c 
    4 @@ -376,7 +376,7 @@ swconfig_dump_attr(struct swconfig_callb 
     4@@ -377,7 +377,7 @@ swconfig_dump_attr(struct swconfig_callb 
    55        int id = cb->args[0]; 
    66        void *hdr; 
     
    1111        if (IS_ERR(hdr)) 
    1212                return -1; 
    13 @@ -798,7 +798,7 @@ swconfig_get_attr(struct sk_buff *skb, s 
     13@@ -799,7 +799,7 @@ swconfig_get_attr(struct sk_buff *skb, s 
    1414        if (!msg) 
    1515                goto error; 
     
    2020        if (IS_ERR(hdr)) 
    2121                goto nla_put_failure; 
    22 @@ -883,7 +883,7 @@ static int swconfig_dump_switches(struct 
     22@@ -902,7 +902,7 @@ static int swconfig_dump_switches(struct 
    2323        list_for_each_entry(dev, &swdevs, dev_list) { 
    2424                if (++idx <= start) 
  • trunk/target/linux/generic/patches-3.3/a03-swconfig-revert-UAPI-disintegration.patch

    r34677 r36295  
    11--- a/include/linux/switch.h 
    22+++ b/include/linux/switch.h 
    3 @@ -13,11 +13,86 @@ 
     3@@ -13,11 +13,95 @@ 
    44  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    55  * GNU General Public License for more details. 
     
    3636+       SWITCH_ATTR_VLANS, 
    3737+       SWITCH_ATTR_PORTS, 
     38+       SWITCH_ATTR_PORTMAP, 
    3839+       SWITCH_ATTR_CPU_PORT, 
    3940+       /* attributes */ 
     
    5051+       SWITCH_ATTR_PORT, 
    5152+       SWITCH_ATTR_MAX 
     53+}; 
     54+ 
     55+enum { 
     56+       /* port map */ 
     57+       SWITCH_PORTMAP_PORTS, 
     58+       SWITCH_PORTMAP_SEGMENT, 
     59+       SWITCH_PORTMAP_VIRT, 
     60+       SWITCH_PORTMAP_MAX 
    5261+}; 
    5362+ 
     
    91100 struct switch_dev; 
    92101 struct switch_op; 
    93 @@ -157,4 +232,6 @@ struct switch_attr { 
     102@@ -164,4 +248,6 @@ struct switch_attr { 
    94103        int max; 
    95104 }; 
  • trunk/target/linux/generic/patches-3.6/a02-swconfig-revert-portid-snd_portid-usage.patch

    r34288 r36295  
    22--- a/drivers/net/phy/swconfig.c 
    33+++ b/drivers/net/phy/swconfig.c 
    4 @@ -376,7 +376,7 @@ swconfig_dump_attr(struct swconfig_callb 
     4@@ -377,7 +377,7 @@ swconfig_dump_attr(struct swconfig_callb 
    55        int id = cb->args[0]; 
    66        void *hdr; 
     
    1111        if (IS_ERR(hdr)) 
    1212                return -1; 
    13 @@ -798,7 +798,7 @@ swconfig_get_attr(struct sk_buff *skb, s 
     13@@ -799,7 +799,7 @@ swconfig_get_attr(struct sk_buff *skb, s 
    1414        if (!msg) 
    1515                goto error; 
     
    2020        if (IS_ERR(hdr)) 
    2121                goto nla_put_failure; 
    22 @@ -883,7 +883,7 @@ static int swconfig_dump_switches(struct 
     22@@ -902,7 +902,7 @@ static int swconfig_dump_switches(struct 
    2323        list_for_each_entry(dev, &swdevs, dev_list) { 
    2424                if (++idx <= start) 
  • trunk/target/linux/generic/patches-3.6/a03-swconfig-revert-UAPI-disintegration.patch

    r34677 r36295  
    11--- a/include/linux/switch.h 
    22+++ b/include/linux/switch.h 
    3 @@ -13,11 +13,86 @@ 
     3@@ -13,11 +13,95 @@ 
    44  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    55  * GNU General Public License for more details. 
     
    3636+       SWITCH_ATTR_VLANS, 
    3737+       SWITCH_ATTR_PORTS, 
     38+       SWITCH_ATTR_PORTMAP, 
    3839+       SWITCH_ATTR_CPU_PORT, 
    3940+       /* attributes */ 
     
    5051+       SWITCH_ATTR_PORT, 
    5152+       SWITCH_ATTR_MAX 
     53+}; 
     54+ 
     55+enum { 
     56+       /* port map */ 
     57+       SWITCH_PORTMAP_PORTS, 
     58+       SWITCH_PORTMAP_SEGMENT, 
     59+       SWITCH_PORTMAP_VIRT, 
     60+       SWITCH_PORTMAP_MAX 
    5261+}; 
    5362+ 
     
    91100 struct switch_dev; 
    92101 struct switch_op; 
    93 @@ -157,4 +232,6 @@ struct switch_attr { 
     102@@ -164,4 +248,6 @@ struct switch_attr { 
    94103        int max; 
    95104 }; 
Note: See TracChangeset for help on using the changeset viewer.