fd0c88b700
We get a new link error in allmodconfig kernels after ftgmac100 started using the ncsi helpers: ERROR: "ncsi_vlan_rx_kill_vid" [drivers/net/ethernet/faraday/ftgmac100.ko] undefined! ERROR: "ncsi_vlan_rx_add_vid" [drivers/net/ethernet/faraday/ftgmac100.ko] undefined! Related to that, we get another error when CONFIG_NET_NCSI is disabled: drivers/net/ethernet/faraday/ftgmac100.c:1626:25: error: 'ncsi_vlan_rx_add_vid' undeclared here (not in a function); did you mean 'ncsi_start_dev'? drivers/net/ethernet/faraday/ftgmac100.c:1627:26: error: 'ncsi_vlan_rx_kill_vid' undeclared here (not in a function); did you mean 'ncsi_vlan_rx_add_vid'? This fixes both problems at once, using a 'static inline' stub helper for the disabled case, and exporting the functions when they are present. Fixes:51564585d8("ftgmac100: Support NCSI VLAN filtering when available") Fixes:21acf63013("net/ncsi: Configure VLAN tag filter") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net>
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
#ifndef __NET_NCSI_H
|
|
#define __NET_NCSI_H
|
|
|
|
/*
|
|
* The NCSI device states seen from external. More NCSI device states are
|
|
* only visible internally (in net/ncsi/internal.h). When the NCSI device
|
|
* is registered, it's in ncsi_dev_state_registered state. The state
|
|
* ncsi_dev_state_start is used to drive to choose active package and
|
|
* channel. After that, its state is changed to ncsi_dev_state_functional.
|
|
*
|
|
* The state ncsi_dev_state_stop helps to shut down the currently active
|
|
* package and channel while ncsi_dev_state_config helps to reconfigure
|
|
* them.
|
|
*/
|
|
enum {
|
|
ncsi_dev_state_registered = 0x0000,
|
|
ncsi_dev_state_functional = 0x0100,
|
|
ncsi_dev_state_probe = 0x0200,
|
|
ncsi_dev_state_config = 0x0300,
|
|
ncsi_dev_state_suspend = 0x0400,
|
|
};
|
|
|
|
struct ncsi_dev {
|
|
int state;
|
|
int link_up;
|
|
struct net_device *dev;
|
|
void (*handler)(struct ncsi_dev *ndev);
|
|
};
|
|
|
|
#ifdef CONFIG_NET_NCSI
|
|
int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid);
|
|
int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid);
|
|
struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
|
|
void (*notifier)(struct ncsi_dev *nd));
|
|
int ncsi_start_dev(struct ncsi_dev *nd);
|
|
void ncsi_stop_dev(struct ncsi_dev *nd);
|
|
void ncsi_unregister_dev(struct ncsi_dev *nd);
|
|
#else /* !CONFIG_NET_NCSI */
|
|
static inline int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static inline int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static inline struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
|
|
void (*notifier)(struct ncsi_dev *nd))
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline int ncsi_start_dev(struct ncsi_dev *nd)
|
|
{
|
|
return -ENOTTY;
|
|
}
|
|
|
|
static void ncsi_stop_dev(struct ncsi_dev *nd)
|
|
{
|
|
}
|
|
|
|
static inline void ncsi_unregister_dev(struct ncsi_dev *nd)
|
|
{
|
|
}
|
|
#endif /* CONFIG_NET_NCSI */
|
|
|
|
#endif /* __NET_NCSI_H */
|