diff options
author | Hauke Mehrtens | 2011-11-17 15:23:09 -0600 |
---|---|---|
committer | Luis R. Rodriguez | 2011-11-17 18:06:41 -0600 |
commit | 63ea3fade83abd8b66f27c00aea9965883b6797a (patch) | |
tree | dc66fac06766130eb9c6cc1124c370c02f2fe364 | |
parent | 1d86517258376a4b71c3a99a663aa88dcb975928 (diff) | |
download | compat-63ea3fade83abd8b66f27c00aea9965883b6797a.tar.gz compat-63ea3fade83abd8b66f27c00aea9965883b6797a.tar.xz compat-63ea3fade83abd8b66f27c00aea9965883b6797a.zip |
compat: add support for kernel 3.2
This adds suport for kernel 3.2.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
-rw-r--r-- | include/linux/compat-3.2.h | 17 | ||||
-rw-r--r-- | include/linux/compat-3.3.h | 16 |
2 files changed, 16 insertions, 17 deletions
diff --git a/include/linux/compat-3.2.h b/include/linux/compat-3.2.h index ceaaecc..db0f648 100644 --- a/include/linux/compat-3.2.h +++ b/include/linux/compat-3.2.h | |||
@@ -8,23 +8,6 @@ | |||
8 | #include <linux/skbuff.h> | 8 | #include <linux/skbuff.h> |
9 | #include <linux/dma-mapping.h> | 9 | #include <linux/dma-mapping.h> |
10 | 10 | ||
11 | /* | ||
12 | * This is not part of The 2.6.37 kernel yet but we | ||
13 | * we use it to optimize the backport code we | ||
14 | * need to implement. Instead of using ifdefs | ||
15 | * to check what version of the check we use | ||
16 | * we just replace all checks on current code | ||
17 | * with this. I'll submit this upstream too, that | ||
18 | * way all we'd have to do is to implement this | ||
19 | * for older kernels, then we would not have to | ||
20 | * edit the upstrema code for backport efforts. | ||
21 | */ | ||
22 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) | ||
23 | #define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT) | ||
24 | #else | ||
25 | #define br_port_exists(dev) (dev->br_port) | ||
26 | #endif | ||
27 | |||
28 | #define PMSG_IS_AUTO(msg) (((msg).event & PM_EVENT_AUTO) != 0) | 11 | #define PMSG_IS_AUTO(msg) (((msg).event & PM_EVENT_AUTO) != 0) |
29 | 12 | ||
30 | /** | 13 | /** |
diff --git a/include/linux/compat-3.3.h b/include/linux/compat-3.3.h index 2e1e6d3..4e96ddc 100644 --- a/include/linux/compat-3.3.h +++ b/include/linux/compat-3.3.h | |||
@@ -8,6 +8,22 @@ | |||
8 | /* include to override NL80211_FEATURE_SK_TX_STATUS */ | 8 | /* include to override NL80211_FEATURE_SK_TX_STATUS */ |
9 | #include <linux/nl80211.h> | 9 | #include <linux/nl80211.h> |
10 | 10 | ||
11 | /* | ||
12 | * This is not part of The 2.6.37 kernel yet but we | ||
13 | * we use it to optimize the backport code we | ||
14 | * need to implement. Instead of using ifdefs | ||
15 | * to check what version of the check we use | ||
16 | * we just replace all checks on current code | ||
17 | * with this. I'll submit this upstream too, that | ||
18 | * way all we'd have to do is to implement this | ||
19 | * for older kernels, then we would not have to | ||
20 | * edit the upstrema code for backport efforts. | ||
21 | */ | ||
22 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) | ||
23 | #define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT) | ||
24 | #else | ||
25 | #define br_port_exists(dev) (dev->br_port) | ||
26 | #endif | ||
11 | 27 | ||
12 | static inline void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) | 28 | static inline void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) |
13 | { | 29 | { |