Author: blogic Date: 2015-09-16 14:40:40 +0200 (Wed, 16 Sep 2015) New Revision: 46983
Modified: trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch Log: kernel: unbreak atm ABI for 4.0 and 4.1 Signed-off-by: John Crispin <[email protected]> Modified: trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch =================================================================== --- trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch 2015-09-16 12:38:16 UTC (rev 46982) +++ trunk/target/linux/generic/patches-4.0/652-atm_header_changes.patch 2015-09-16 12:40:40 UTC (rev 46983) @@ -1,12 +1,14 @@ --- a/include/uapi/linux/atm.h +++ b/include/uapi/linux/atm.h -@@ -139,6 +139,9 @@ struct atm_trafprm { - int min_pcr; /* minimum PCR in cells per second */ - int max_cdv; /* maximum CDV in microseconds */ - int max_sdu; /* maximum SDU in bytes */ +@@ -154,6 +154,11 @@ + unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */ + unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */ + unsigned int spare :9; /* spare bits */ ++#ifdef CONFIG_LANTIQ + int scr; /* sustained rate in cells per second */ + int mbs; /* maximum burst size (MBS) in cells */ + int cdv; /* Cell delay varition */ - /* extra params for ABR */ - unsigned int icr; /* Initial Cell Rate (24-bit) */ - unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ ++#endif + }; + + struct atm_qos { Modified: trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch 2015-09-16 12:38:16 UTC (rev 46982) +++ trunk/target/linux/generic/patches-4.1/652-atm_header_changes.patch 2015-09-16 12:40:40 UTC (rev 46983) @@ -1,12 +1,14 @@ --- a/include/uapi/linux/atm.h +++ b/include/uapi/linux/atm.h -@@ -139,6 +139,9 @@ struct atm_trafprm { - int min_pcr; /* minimum PCR in cells per second */ - int max_cdv; /* maximum CDV in microseconds */ - int max_sdu; /* maximum SDU in bytes */ +@@ -154,6 +154,11 @@ + unsigned int adtf :10; /* ACR Decrease Time Factor (10-bit) */ + unsigned int cdf :3; /* Cutoff Decrease Factor (3-bit) */ + unsigned int spare :9; /* spare bits */ ++#ifdef CONFIG_LANTIQ + int scr; /* sustained rate in cells per second */ + int mbs; /* maximum burst size (MBS) in cells */ + int cdv; /* Cell delay varition */ - /* extra params for ABR */ - unsigned int icr; /* Initial Cell Rate (24-bit) */ - unsigned int tbe; /* Transient Buffer Exposure (24-bit) */ ++#endif + }; + + struct atm_qos { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
