diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-12-01 12:14:48 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-12-01 12:14:48 +0200 |
| commit | e4da3fbfbd1de56d2367653e3823e6445e49f8a9 (patch) | |
| tree | f69f424f731b89a75f881967903ff2f38f4b6a92 /include/linux/errqueue.h | |
| parent | b693289406f0b8ca70ab77e745be6196d5740eb0 (diff) | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
| download | cachepc-linux-e4da3fbfbd1de56d2367653e3823e6445e49f8a9.tar.gz cachepc-linux-e4da3fbfbd1de56d2367653e3823e6445e49f8a9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
Diffstat (limited to 'include/linux/errqueue.h')
| -rw-r--r-- | include/linux/errqueue.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index 034072cea853..c9f522bd17e4 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)) |