diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-14 16:20:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-14 16:20:58 -0500 |
| commit | 7772f773dc08899410ce89c47b923961c5cfbf25 (patch) | |
| tree | 4485ae0e156ba61a2def384891de2f9913ebaf31 | |
| parent | e286213484e724dcba21c214f7316fdf6ccbcf6b (diff) | |
| parent | 69d9728d00c7f2acc290d08718c185f231b8fc20 (diff) | |
Merge branch 'ppp-type-and-name'
Guillaume Nault says:
====================
Minor PPP devices improvements
Let PPP devices be friendlier to user space by registering their device
type and reporting their interface naming scheme.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 9a863c6a6a33..fc8ad001bc94 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -1138,9 +1138,15 @@ static const struct net_device_ops ppp_netdev_ops = { .ndo_get_stats64 = ppp_get_stats64, }; +static struct device_type ppp_type = { + .name = "ppp", +}; + static void ppp_setup(struct net_device *dev) { dev->netdev_ops = &ppp_netdev_ops; + SET_NETDEV_DEVTYPE(dev, &ppp_type); + dev->hard_header_len = PPP_HDRLEN; dev->mtu = PPP_MRU; dev->addr_len = 0; @@ -2720,8 +2726,7 @@ static struct ppp *ppp_create_interface(struct net *net, int unit, int ret = -ENOMEM; int i; - dev = alloc_netdev(sizeof(struct ppp), "", NET_NAME_UNKNOWN, - ppp_setup); + dev = alloc_netdev(sizeof(struct ppp), "", NET_NAME_ENUM, ppp_setup); if (!dev) goto out1; |