Thread (4 messages) flat view 4 messages, 3 authors, 2014-06-27
STALE4459d

[PATCH] enic: fix a building failure

From: <hidden>
Date: 2014-06-27 02:09:40
Subsystem: cisco vic ethernet nic driver, networking drivers, the rest · Maintainers: Satish Kharat, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

From: Li RongQing <redacted>

When RFS_ACCEL is disabled, the building failed:
    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]
      enic_rfs_flw_tbl_init(enic);
      ^
    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]
      enic_rfs_flw_tbl_free(enic);

In fact, these two functions have been defined separately for enabling RFS_ACCEL
and disabling RFS_ACCEL.

Reported-by: Jim Davis <redacted>
Cc: Govindarajulu Varadarajan <redacted>
Signed-off-by: Li RongQing <redacted>
---
 drivers/net/ethernet/cisco/enic/enic_clsf.h |    3 ---
 1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h b/drivers/net/ethernet/cisco/enic/enic_clsf.h
index 76a85bb..b38cc7e 100644
--- a/drivers/net/ethernet/cisco/enic/enic_clsf.h
+++ b/drivers/net/ethernet/cisco/enic/enic_clsf.h
@@ -9,11 +9,8 @@
 int enic_addfltr_5t(struct enic *enic, struct flow_keys *keys, u16 rq);
 int enic_delfltr(struct enic *enic, u16 filter_id);
 
-#ifdef CONFIG_RFS_ACCEL
 void enic_rfs_flw_tbl_init(struct enic *enic);
 void enic_rfs_flw_tbl_free(struct enic *enic);
 int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
 		       u16 rxq_index, u32 flow_id);
-#endif /* CONFIG_RFS_ACCEL */
-
 #endif /* _ENIC_CLSF_H_ */
-- 
1.7.10.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help