--- zzzz-none-000/linux-3.10.107/include/linux/if_vlan.h 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/include/linux/if_vlan.h 2021-11-10 11:53:56.000000000 +0000 @@ -103,25 +103,25 @@ extern bool vlan_uses_dev(const struct net_device *dev); #else static inline struct net_device * -__vlan_find_dev_deep(struct net_device *real_dev, - __be16 vlan_proto, u16 vlan_id) +__vlan_find_dev_deep(struct net_device *real_dev __maybe_unused, + __be16 vlan_proto __maybe_unused, u16 vlan_id __maybe_unused) { return NULL; } -static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev) +static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev __maybe_unused) { BUG(); return NULL; } -static inline u16 vlan_dev_vlan_id(const struct net_device *dev) +static inline u16 vlan_dev_vlan_id(const struct net_device *dev __maybe_unused) { BUG(); return 0; } -static inline bool vlan_do_receive(struct sk_buff **skb) +static inline bool vlan_do_receive(struct sk_buff **skb __maybe_unused) { return false; } @@ -131,27 +131,27 @@ return skb; } -static inline int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid) +static inline int vlan_vid_add(struct net_device *dev __maybe_unused, __be16 proto __maybe_unused, u16 vid __maybe_unused) { return 0; } -static inline void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid) +static inline void vlan_vid_del(struct net_device *dev __maybe_unused, __be16 proto __maybe_unused, u16 vid __maybe_unused) { } -static inline int vlan_vids_add_by_dev(struct net_device *dev, - const struct net_device *by_dev) +static inline int vlan_vids_add_by_dev(struct net_device *dev __maybe_unused, + const struct net_device *by_dev __maybe_unused) { return 0; } -static inline void vlan_vids_del_by_dev(struct net_device *dev, - const struct net_device *by_dev) +static inline void vlan_vids_del_by_dev(struct net_device *dev __maybe_unused, + const struct net_device *by_dev __maybe_unused) { } -static inline bool vlan_uses_dev(const struct net_device *dev) +static inline bool vlan_uses_dev(const struct net_device *dev __maybe_unused) { return false; } @@ -377,4 +377,8 @@ */ skb->protocol = htons(ETH_P_802_2); } + +#define AVM_REGISTER_VLAN_DEVICE +int avm_register_vlan_device(struct net_device *real_dev, u16 vlan_id, char *name, struct net_device **vlan_dev); + #endif /* !(_LINUX_IF_VLAN_H_) */