diff options
| author | Zhang Shengju <zhangshengju@cmss.chinamobile.com> | 2016-12-07 17:26:05 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-07 13:28:26 -0500 |
| commit | e82621e329b61ab8d6f0c987376512cf420ac9fe (patch) | |
| tree | b7f5ee6ecbb32330706f7ec1913f352dfd3457a7 | |
| parent | a1f5315ce4e1700e65255c617561aa7d8f09a729 (diff) | |
| download | linux-e82621e329b61ab8d6f0c987376512cf420ac9fe.tar.bz2 | |
nlmon: use core MTU range checking in nlmon driver
Since commit 61e84623ace3 ("net: centralize net_device min/max MTU checking"),
mtu range is checked at dev_set_mtu().
This patch adds min_mtu for nlmon device and remove unnecessary
ndo_change_mtu() function.
Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/nlmon.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c index 7b7c70e2341e..2de7faee9b19 100644 --- a/drivers/net/nlmon.c +++ b/drivers/net/nlmon.c @@ -27,24 +27,6 @@ static netdev_tx_t nlmon_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } -static int nlmon_is_valid_mtu(int new_mtu) -{ - /* Note that in netlink we do not really have an upper limit. On - * default, we use NLMSG_GOODSIZE. Here at least we should make - * sure that it's at least the header size. - */ - return new_mtu >= (int) sizeof(struct nlmsghdr); -} - -static int nlmon_change_mtu(struct net_device *dev, int new_mtu) -{ - if (!nlmon_is_valid_mtu(new_mtu)) - return -EINVAL; - - dev->mtu = new_mtu; - return 0; -} - static int nlmon_dev_init(struct net_device *dev) { dev->lstats = netdev_alloc_pcpu_stats(struct pcpu_lstats); @@ -124,7 +106,6 @@ static const struct net_device_ops nlmon_ops = { .ndo_stop = nlmon_close, .ndo_start_xmit = nlmon_xmit, .ndo_get_stats64 = nlmon_get_stats64, - .ndo_change_mtu = nlmon_change_mtu, }; static void nlmon_setup(struct net_device *dev) @@ -145,6 +126,7 @@ static void nlmon_setup(struct net_device *dev) * expected in most cases. */ dev->mtu = NLMSG_GOODSIZE; + dev->min_mtu = sizeof(struct nlmsghdr); } static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[]) |