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 /drivers/net/skfp/h/fplustm.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 'drivers/net/skfp/h/fplustm.h')
| -rw-r--r-- | drivers/net/skfp/h/fplustm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/skfp/h/fplustm.h index 6d738e1e2393..d43191ed938b 100644 --- a/drivers/net/skfp/h/fplustm.h +++ b/drivers/net/skfp/h/fplustm.h | |||
| @@ -237,8 +237,8 @@ struct s_smt_fp { | |||
| 237 | */ | 237 | */ |
| 238 | #define RX_ENABLE_ALLMULTI 1 /* enable all multicasts */ | 238 | #define RX_ENABLE_ALLMULTI 1 /* enable all multicasts */ |
| 239 | #define RX_DISABLE_ALLMULTI 2 /* disable "enable all multicasts" */ | 239 | #define RX_DISABLE_ALLMULTI 2 /* disable "enable all multicasts" */ |
| 240 | #define RX_ENABLE_PROMISC 3 /* enable promiscous */ | 240 | #define RX_ENABLE_PROMISC 3 /* enable promiscuous */ |
| 241 | #define RX_DISABLE_PROMISC 4 /* disable promiscous */ | 241 | #define RX_DISABLE_PROMISC 4 /* disable promiscuous */ |
| 242 | #define RX_ENABLE_NSA 5 /* enable reception of NSA frames */ | 242 | #define RX_ENABLE_NSA 5 /* enable reception of NSA frames */ |
| 243 | #define RX_DISABLE_NSA 6 /* disable reception of NSA frames */ | 243 | #define RX_DISABLE_NSA 6 /* disable reception of NSA frames */ |
| 244 | 244 | ||