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/enic/vnic_rss.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/enic/vnic_rss.h')
| -rw-r--r-- | drivers/net/enic/vnic_rss.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/enic/vnic_rss.h index f62d18719629..fa421baf45b8 100644 --- a/drivers/net/enic/vnic_rss.h +++ b/drivers/net/enic/vnic_rss.h | |||
| @@ -37,9 +37,4 @@ union vnic_rss_cpu { | |||
| 37 | u64 raw[32]; | 37 | u64 raw[32]; |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | void vnic_set_rss_key(union vnic_rss_key *rss_key, u8 *key); | ||
| 41 | void vnic_set_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu); | ||
| 42 | void vnic_get_rss_key(union vnic_rss_key *rss_key, u8 *key); | ||
| 43 | void vnic_get_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu); | ||
| 44 | |||
| 45 | #endif /* _VNIC_RSS_H_ */ | 40 | #endif /* _VNIC_RSS_H_ */ |