aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/errqueue.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-21 01:33:48 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-01-21 01:33:48 +0100
commit68e6d7d60c0b35990cb8056e317ba97f0fe73047 (patch)
tree92a7e8745a05aefdb0464eefb0691ae568ca2367 /include/linux/errqueue.h
parent3619db98361964903b81cfad1df177ba2545adb3 (diff)
downloadkernel_samsung_smdk4412-68e6d7d60c0b35990cb8056e317ba97f0fe73047.zip
kernel_samsung_smdk4412-68e6d7d60c0b35990cb8056e317ba97f0fe73047.tar.gz
kernel_samsung_smdk4412-68e6d7d60c0b35990cb8056e317ba97f0fe73047.tar.bz2
Backport mac80211 from 3.4 kernel
The ath9k_htc driver depends on mac80211, but mac80211 can't be build. The reason is that net/wireless is almost completely backported from a 3.4 kernel. To follow suit, mac80211 is also backported from 3.4, more precisely from 3.4.113. This makes mac80211 build. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'include/linux/errqueue.h')
-rw-r--r--include/linux/errqueue.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 034072c..c9f522b 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -17,7 +17,8 @@ struct sock_extended_err {
#define SO_EE_ORIGIN_LOCAL 1
#define SO_EE_ORIGIN_ICMP 2
#define SO_EE_ORIGIN_ICMP6 3
-#define SO_EE_ORIGIN_TIMESTAMPING 4
+#define SO_EE_ORIGIN_TXSTATUS 4
+#define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS
#define SO_EE_OFFENDER(ee) ((struct sockaddr*)((ee)+1))