new file mode 100644
@@ -0,0 +1,64 @@
+#ifndef _NETDEV_FEATURES_H
+#define _NETDEV_FEATURES_H
+
+/* Forward declarations */
+struct net_device;
+
+typedef unsigned long *nd_feature_t;
+
+static inline void _nd_set_feature(u32 *old_field,
+ unsigned long *new_field, int bit)
+{
+ if (bit < 32)
+ *old_field |= (1 << bit);
+ set_bit(bit, new_field);
+}
+
+static inline void _nd_clear_feature(u32 *old_field,
+ unsigned long *new_field, int bit)
+{
+ if (bit < 32)
+ *old_field &= ~(1 << bit);
+
+ clear_bit(bit, new_field);
+}
+
+static inline bool _nd_test_feature(u32 old_field,
+ unsigned long *new_field, int bit)
+{
+ if (bit < 32)
+ return (old_field & (1 << bit)) == 1;
+
+ return test_bit(bit, new_field) == 1;
+}
+
+#define netdev_set_active_feature(dev, bit) \
+ _nd_set_feature(&(dev)->features, (dev)->active_feature, (bit))
+#define netdev_clear_active_feature(dev, bit) \
+ _nd_clear_feature(&(dev)->features, (dev)->active_feature, (bit))
+#define netdev_test_active_feature(dev, bit) \
+ _nd_test_feature((dev)->features, (dev)->active_feature, (bit))
+
+#define netdev_set_offered_feature(dev, bit) \
+ _nd_set_feature(&(dev)->hw_features, (dev)->offered_feature, (bit))
+#define netdev_clear_offered_feature(dev, bit) \
+ _nd_clear_feature(&(dev)->hw_features, (dev)->offered_feature, (bit))
+#define netdev_test_offered_feature(dev, bit) \
+ _nd_test_feature((dev)->hw_features, (dev)->offered_feature, (bit))
+
+#define netdev_set_vlan_feature(dev, bit) \
+ _nd_set_feature(&(dev)->vlan_features, (dev)->vlan_feature, (bit))
+#define netdev_clear_vlan_feature(dev, bit) \
+ _nd_clear_feature(&(dev)->vlan_features, (dev)->vlan_feature, (bit))
+#define netdev_test_vlan_feature(dev, bit) \
+ _nd_test_feature((dev)->vlan_features, (dev)->vlan_feature, (bit))
+
+#define netdev_set_wanted_feature(dev, bit) \
+ _nd_set_feature(&(dev)->wanted_features, (dev)->wanted_feature, (bit))
+#define netdev_clear_wanted_feature(dev, bit) \
+ _nd_clear_feature(&(dev)->wanted_features, (dev)->wanted_feature, (bit))
+#define netdev_test_wanted_feature(dev, bit) \
+ _nd_test_feature((dev)->wanted_features, (dev)->wanted_feature, (bit))
+
+
+#endif /* __NETDEV_FEATURES_H */
@@ -51,6 +51,7 @@
#ifdef CONFIG_DCB
#include <net/dcbnl.h>
#endif
+#include <linux/netdev_features.h>
struct vlan_group;
struct netpoll_info;
@@ -1078,6 +1079,14 @@ struct net_device {
/* mask of features inheritable by VLAN devices */
u32 vlan_features;
+#define DEV_FEATURE_WORDS BITS_TO_LONGS(ND_FEATURE_NUM_BITS)
+#define DEV_FEATURE_BITS (DEV_FEATURE_WORDS * BITS_PER_LONG)
+
+ DECLARE_BITMAP(active_feature, DEV_FEATURE_BITS);
+ DECLARE_BITMAP(offered_feature, DEV_FEATURE_BITS);
+ DECLARE_BITMAP(wanted_feature, DEV_FEATURE_BITS);
+ DECLARE_BITMAP(vlan_feature, DEV_FEATURE_BITS);
+
#define BIT2FLAG(bit) (1 << (bit))
#define NETIF_F_SG BIT2FLAG(NETIF_F_SG_BIT)
Define macros to set/clear/test bits for feature set usage. This will eliminate the direct use of these fields and enable future ease in managing these fields. Signed-off-by: Mahesh Bandewar <maheshb@google.com> --- Changes since v2: Added the include which accidently went into the other patch. Changes since v1: Split the patch into two pieces. include/linux/netdev_features.h | 64 +++++++++++++++++++++++++++++++++++++++ include/linux/netdevice.h | 9 +++++ 2 files changed, 73 insertions(+), 0 deletions(-) create mode 100644 include/linux/netdev_features.h