[dpdk-dev] kni: don't rewrite ethernet address every time an interface goes up
Commit Message
Now every time a KNI interface goes up, its ethernet address is overwritten.
After this patch ethernet address is assigned only once, at initialization
time.
Suggested-by: Sergey Balabanov <balabanovsv@ecotelecom.ru>
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
---
lib/librte_eal/linuxapp/kni/kni_misc.c | 10 ++++++++++
lib/librte_eal/linuxapp/kni/kni_net.c | 9 ---------
2 files changed, 10 insertions(+), 9 deletions(-)
Comments
Self nack. Forgot to change variable name from dev to net_dev. Will send v2.
> 21 апр. 2016 г., в 18:12, Igor Ryzhov <iryzhov@nfware.com> написал(а):
>
> Now every time a KNI interface goes up, its ethernet address is overwritten.
> After this patch ethernet address is assigned only once, at initialization
> time.
>
> Suggested-by: Sergey Balabanov <balabanovsv@ecotelecom.ru>
> Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
> ---
> lib/librte_eal/linuxapp/kni/kni_misc.c | 10 ++++++++++
> lib/librte_eal/linuxapp/kni/kni_net.c | 9 ---------
> 2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
> index ae8133f..45bcf32 100644
> --- a/lib/librte_eal/linuxapp/kni/kni_misc.c
> +++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
> @@ -26,6 +26,7 @@
> #include <linux/module.h>
> #include <linux/miscdevice.h>
> #include <linux/netdevice.h>
> +#include <linux/etherdevice.h>
> #include <linux/pci.h>
> #include <linux/kthread.h>
> #include <linux/rwsem.h>
> @@ -542,6 +543,15 @@ kni_ioctl_create(struct net *net,
> if (pci)
> pci_dev_put(pci);
>
> + if (kni->lad_dev)
> + memcpy(dev->dev_addr, kni->lad_dev->dev_addr, ETH_ALEN);
> + else
> + /*
> + * Generate random mac address. eth_random_addr() is the newer
> + * version of generating mac address in linux kernel.
> + */
> + random_ether_addr(dev->dev_addr);
> +
> ret = register_netdev(net_dev);
> if (ret) {
> KNI_ERR("error %i registering device \"%s\"\n",
> diff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c
> index cfa8339..3d2d246 100644
> --- a/lib/librte_eal/linuxapp/kni/kni_net.c
> +++ b/lib/librte_eal/linuxapp/kni/kni_net.c
> @@ -69,15 +69,6 @@ kni_net_open(struct net_device *dev)
> struct rte_kni_request req;
> struct kni_dev *kni = netdev_priv(dev);
>
> - if (kni->lad_dev)
> - memcpy(dev->dev_addr, kni->lad_dev->dev_addr, ETH_ALEN);
> - else
> - /*
> - * Generate random mac address. eth_random_addr() is the newer
> - * version of generating mac address in linux kernel.
> - */
> - random_ether_addr(dev->dev_addr);
> -
> netif_start_queue(dev);
>
> memset(&req, 0, sizeof(req));
> --
> 2.6.4
>
@@ -26,6 +26,7 @@
#include <linux/module.h>
#include <linux/miscdevice.h>
#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
#include <linux/pci.h>
#include <linux/kthread.h>
#include <linux/rwsem.h>
@@ -542,6 +543,15 @@ kni_ioctl_create(struct net *net,
if (pci)
pci_dev_put(pci);
+ if (kni->lad_dev)
+ memcpy(dev->dev_addr, kni->lad_dev->dev_addr, ETH_ALEN);
+ else
+ /*
+ * Generate random mac address. eth_random_addr() is the newer
+ * version of generating mac address in linux kernel.
+ */
+ random_ether_addr(dev->dev_addr);
+
ret = register_netdev(net_dev);
if (ret) {
KNI_ERR("error %i registering device \"%s\"\n",
@@ -69,15 +69,6 @@ kni_net_open(struct net_device *dev)
struct rte_kni_request req;
struct kni_dev *kni = netdev_priv(dev);
- if (kni->lad_dev)
- memcpy(dev->dev_addr, kni->lad_dev->dev_addr, ETH_ALEN);
- else
- /*
- * Generate random mac address. eth_random_addr() is the newer
- * version of generating mac address in linux kernel.
- */
- random_ether_addr(dev->dev_addr);
-
netif_start_queue(dev);
memset(&req, 0, sizeof(req));