aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>2015-03-27 01:31:13 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-29 16:33:22 -0400
commite38f30256b36700aa63aa709dc091bf6eb69c257 (patch)
tree38bba4e689724e221a69ccdde88fb31441cba1c5
parent8cb65d00086bfba22bac87ff18b751432fc74003 (diff)
net: Introduce passthru_features_check
As there are a number of (especially virtual) devices that don't need the multiple vlan check, introduce passthru_features_check() for convenience. Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h3
-rw-r--r--net/core/dev.c8
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 08c4ab37189f..967bb4c8caf1 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3657,6 +3657,9 @@ void netdev_change_features(struct net_device *dev);
3657void netif_stacked_transfer_operstate(const struct net_device *rootdev, 3657void netif_stacked_transfer_operstate(const struct net_device *rootdev,
3658 struct net_device *dev); 3658 struct net_device *dev);
3659 3659
3660netdev_features_t passthru_features_check(struct sk_buff *skb,
3661 struct net_device *dev,
3662 netdev_features_t features);
3660netdev_features_t netif_skb_features(struct sk_buff *skb); 3663netdev_features_t netif_skb_features(struct sk_buff *skb);
3661 3664
3662static inline bool net_gso_ok(netdev_features_t features, int gso_type) 3665static inline bool net_gso_ok(netdev_features_t features, int gso_type)
diff --git a/net/core/dev.c b/net/core/dev.c
index cb46badbef5a..3a06003ecafd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2562,6 +2562,14 @@ static netdev_features_t harmonize_features(struct sk_buff *skb,
2562 return features; 2562 return features;
2563} 2563}
2564 2564
2565netdev_features_t passthru_features_check(struct sk_buff *skb,
2566 struct net_device *dev,
2567 netdev_features_t features)
2568{
2569 return features;
2570}
2571EXPORT_SYMBOL(passthru_features_check);
2572
2565static netdev_features_t dflt_features_check(const struct sk_buff *skb, 2573static netdev_features_t dflt_features_check(const struct sk_buff *skb,
2566 struct net_device *dev, 2574 struct net_device *dev,
2567 netdev_features_t features) 2575 netdev_features_t features)