Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 0c1ad04aecb975f2a2014e1bc5a2fa23923ecbd9

Authored by WANG Cong
Committed by David S. Miller
1 parent fe6fe792fa
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

netpoll: prevent netpoll setup on slave devices 

In commit 8d8fc29d02a33e4bd5f4fa47823c1fd386346093
(netpoll: disable netpoll when enslave a device), we automatically
disable netpoll when the underlying device is being enslaved,
we also need to prevent people from setuping netpoll on
devices that are already enslaved.

Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 6 additions and 0 deletions Side-by-side Diff

... ... @@ -792,6 +792,12 @@
792 792 return -ENODEV;
793 793 }
794 794  
  795 + if (ndev->master) {
  796 + printk(KERN_ERR "%s: %s is a slave device, aborting.\n",
  797 + np->name, np->dev_name);
  798 + return -EBUSY;
  799 + }
  800 +
795 801 if (!netif_running(ndev)) {
796 802 unsigned long atmost, atleast;
797 803