diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/net/ipx.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/net/ipx.h')
| -rw-r--r-- | include/net/ipx.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/ipx.h b/include/net/ipx.h index 05d7e4a88b49..c1fec6b464cc 100644 --- a/include/net/ipx.h +++ b/include/net/ipx.h | |||
| @@ -80,7 +80,6 @@ struct ipx_route { | |||
| 80 | atomic_t refcnt; | 80 | atomic_t refcnt; |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | #ifdef __KERNEL__ | ||
| 84 | struct ipx_cb { | 83 | struct ipx_cb { |
| 85 | u8 ipx_tctrl; | 84 | u8 ipx_tctrl; |
| 86 | __be32 ipx_dest_net; | 85 | __be32 ipx_dest_net; |
| @@ -116,7 +115,6 @@ static inline struct ipx_sock *ipx_sk(struct sock *sk) | |||
| 116 | } | 115 | } |
| 117 | 116 | ||
| 118 | #define IPX_SKB_CB(__skb) ((struct ipx_cb *)&((__skb)->cb[0])) | 117 | #define IPX_SKB_CB(__skb) ((struct ipx_cb *)&((__skb)->cb[0])) |
| 119 | #endif | ||
| 120 | 118 | ||
| 121 | #define IPX_MIN_EPHEMERAL_SOCKET 0x4000 | 119 | #define IPX_MIN_EPHEMERAL_SOCKET 0x4000 |
| 122 | #define IPX_MAX_EPHEMERAL_SOCKET 0x7fff | 120 | #define IPX_MAX_EPHEMERAL_SOCKET 0x7fff |