diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-06-25 04:31:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-25 21:04:41 -0400 |
commit | 644a918d20336a7deaa81f675c3c2f25bf3dafbb (patch) | |
tree | 410075147c7e4dced04a1355373a331ec5d1b30c /drivers/net/ethernet/cisco | |
parent | a6eacef7fba7834da4d22762ea0d8524df3993a8 (diff) |
enic: Make dummy rfs functions inline to fix !CONFIG_RFS_ACCEL build
If CONFIG_RFS_ACCEL=n:
drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_open':
drivers/net/ethernet/cisco/enic/enic_main.c:1603:2: error: implicit declaration of function 'enic_rfs_flw_tbl_init' [-Werror=implicit-function-declaration]
drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_stop':
drivers/net/ethernet/cisco/enic/enic_main.c:1630:2: error: implicit declaration of function 'enic_rfs_flw_tbl_free' [-Werror=implicit-function-declaration]
Introduced in commit a145df23ef32c7b933875f334ba28791ee75766e ("enic: Add
Accelerated RFS support").
Dummy functions are provided, but their prototypes are missing, causing the
build failure. Provide dummy static inline functions instead to fix this.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_clsf.c | 10 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_clsf.h | 3 |
2 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c index c2322adfccdc..bc451baac4cd 100644 --- a/drivers/net/ethernet/cisco/enic/enic_clsf.c +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.c | |||
@@ -266,14 +266,4 @@ ret_unlock: | |||
266 | return res; | 266 | return res; |
267 | } | 267 | } |
268 | 268 | ||
269 | #else | ||
270 | |||
271 | void enic_rfs_flw_tbl_init(struct enic *enic) | ||
272 | { | ||
273 | } | ||
274 | |||
275 | void enic_rfs_flw_tbl_free(struct enic *enic) | ||
276 | { | ||
277 | } | ||
278 | |||
279 | #endif /* CONFIG_RFS_ACCEL */ | 269 | #endif /* CONFIG_RFS_ACCEL */ |
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h b/drivers/net/ethernet/cisco/enic/enic_clsf.h index 76a85bb0bb73..d572704cd117 100644 --- a/drivers/net/ethernet/cisco/enic/enic_clsf.h +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.h | |||
@@ -14,6 +14,9 @@ void enic_rfs_flw_tbl_init(struct enic *enic); | |||
14 | void enic_rfs_flw_tbl_free(struct enic *enic); | 14 | void enic_rfs_flw_tbl_free(struct enic *enic); |
15 | int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, | 15 | int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, |
16 | u16 rxq_index, u32 flow_id); | 16 | u16 rxq_index, u32 flow_id); |
17 | #else | ||
18 | static inline void enic_rfs_flw_tbl_init(struct enic *enic) {} | ||
19 | static inline void enic_rfs_flw_tbl_free(struct enic *enic) {} | ||
17 | #endif /* CONFIG_RFS_ACCEL */ | 20 | #endif /* CONFIG_RFS_ACCEL */ |
18 | 21 | ||
19 | #endif /* _ENIC_CLSF_H_ */ | 22 | #endif /* _ENIC_CLSF_H_ */ |