1. 21 10月, 2016 9 次提交
    • J
      net: use core MTU range checking in WAN drivers · 8b6b4135
      Jarod Wilson 提交于
      - set min/max_mtu in all hdlc drivers, remove hdlc_change_mtu
      - sent max_mtu in lec driver, remove lec_change_mtu
      - set min/max_mtu in x25_asy driver
      
      CC: netdev@vger.kernel.org
      CC: Krzysztof Halasa <khc@pm.waw.pl>
      CC: Krzysztof Halasa <khalasa@piap.pl>
      CC: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
      CC: Francois Romieu <romieu@fr.zoreil.com>
      CC: Kevin Curtis <kevin.curtis@farsite.co.uk>
      CC: Zhao Qiang <qiang.zhao@nxp.com>
      Signed-off-by: NJarod Wilson <jarod@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8b6b4135
    • J
      net: use core MTU range checking in wireless drivers · 9c22b4a3
      Jarod Wilson 提交于
      - set max_mtu in wil6210 driver
      - set max_mtu in atmel driver
      - set min/max_mtu in cisco airo driver, remove airo_change_mtu
      - set min/max_mtu in ipw2100/ipw2200 drivers, remove libipw_change_mtu
      - set min/max_mtu in p80211netdev, remove wlan_change_mtu
      - set min/max_mtu in net/mac80211/iface.c and remove ieee80211_change_mtu
      - set min/max_mtu in wimax/i2400m and remove i2400m_change_mtu
      - set min/max_mtu in intersil/hostap and remove prism2_change_mtu
      - set min/max_mtu in intersil/orinoco
      - set min/max_mtu in tty/n_gsm and remove gsm_change_mtu
      
      CC: netdev@vger.kernel.org
      CC: linux-wireless@vger.kernel.org
      CC: Maya Erez <qca_merez@qca.qualcomm.com>
      CC: Simon Kelley <simon@thekelleys.org.uk>
      CC: Stanislav Yakovlev <stas.yakovlev@gmail.com>
      CC: Johannes Berg <johannes@sipsolutions.net>
      CC: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
      Signed-off-by: NJarod Wilson <jarod@redhat.com>
      Acked-by: NJohannes Berg <johannes@sipsolutions.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9c22b4a3
    • J
      net: use core MTU range checking in USB NIC drivers · f77f0aee
      Jarod Wilson 提交于
      usbnet:
      - Remove stale new_mtu <= 0 check in usbnet.c
      - Set min_mtu = 0, max_mtu = 65535 (sub-drivers must set their own
        max_mtu and/or min_mtu as needed)
      
      r8152:
      - Set appropriate max_mtu for different variants (1500 or 9194)
      
      lan78xx:
      - Set max_mtu = 9000
      
      asix_driver:
      - max_mtu = 16384 for ax88178 variant
      
      ax88179:
      - max_mtu = 4088
      
      cdc_ncm:
      - max_mtu from hardware
      
      cdc-phonet:
      - min_mtu = 6, max_mtu = 65541
      
      sierra_net:
      - max_mtu = 1500, call usbnet_change_mtu directly
      - sierra_net_change_mtu checked for MTU > 1500, then called
        usbnet_change_mtu, but if we set max_mtu to let the network core handle
        the range check, then we can simply call usbnet_change_mtu directly
      
      smsc75xx:
      - max_mtu = 9000
      
      CC: netdev@vger.kernel.org
      CC: Woojung Huh <woojung.huh@microchip.com>
      CC: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
      CC: Hayes Wang <hayeswang@realtek.com>
      CC: Oliver Neukum <oneukum@suse.com>
      CC: Steve Glendinning <steve.glendinning@shawell.net>
      Signed-off-by: NJarod Wilson <jarod@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f77f0aee
    • J
      ethernet: use net core MTU range checking in more drivers · d894be57
      Jarod Wilson 提交于
      Somehow, I missed a healthy number of ethernet drivers in the last pass.
      Most of these drivers either were in need of an updated max_mtu to make
      jumbo frames possible to enable again. In a few cases, also setting a
      different min_mtu to match previous lower bounds. There are also a few
      drivers that had no upper bounds checking, so they're getting a brand new
      ETH_MAX_MTU that is identical to IP_MAX_MTU, but accessible by includes
      all ethernet and ethernet-like drivers all have already.
      
      acenic:
      - min_mtu = 0, max_mtu = 9000
      
      amazon/ena:
      - min_mtu = 128, max_mtu = adapter->max_mtu
      
      amd/xgbe:
      - min_mtu = 0, max_mtu = 9000
      
      sb1250:
      - min_mtu = 0, max_mtu = 1518
      
      cxgb3:
      - min_mtu = 81, max_mtu = 65535
      
      cxgb4:
      - min_mtu = 81, max_mtu = 9600
      
      cxgb4vf:
      - min_mtu = 81, max_mtu = 65535
      
      benet:
      - min_mtu = 256, max_mtu = 9000
      
      ibmveth:
      - min_mtu = 68, max_mtu = 65535
      
      ibmvnic:
      - min_mtu = adapter->min_mtu, max_mtu = adapter->max_mtu
      - remove now redundant ibmvnic_change_mtu
      
      jme:
      - min_mtu = 1280, max_mtu = 9202
      
      mv643xx_eth:
      - min_mtu = 64, max_mtu = 9500
      
      mlxsw:
      - min_mtu = 0, max_mtu = 65535
      - Basically bypassing the core checks, and instead relying on dynamic
        checks in the respective switch drivers' ndo_change_mtu functions
      
      ns83820:
      - min_mtu = 0
      - remove redundant ns83820_change_mtu, only checked for mtu > 1500
      
      netxen:
      - min_mtu = 0, max_mtu = 8000 (P2), max_mtu = 9600 (P3)
      
      qlge:
      - min_mtu = 1500, max_mtu = 9000
      - driver only supports setting mtu to 1500 or 9000, so the core check only
        rules out < 1500 and > 9000, qlge_change_mtu still needs to check that
        the value is 1500 or 9000
      
      qualcomm/emac:
      - min_mtu = 46, max_mtu = 9194
      
      xilinx_axienet:
      - min_mtu = 64, max_mtu = 9000
      
      Fixes: 61e84623 ("net: centralize net_device min/max MTU checking")
      CC: netdev@vger.kernel.org
      CC: Jes Sorensen <jes@trained-monkey.org>
      CC: Netanel Belgazal <netanel@annapurnalabs.com>
      CC: Tom Lendacky <thomas.lendacky@amd.com>
      CC: Santosh Raspatur <santosh@chelsio.com>
      CC: Hariprasad S <hariprasad@chelsio.com>
      CC: Sathya Perla <sathya.perla@broadcom.com>
      CC: Ajit Khaparde <ajit.khaparde@broadcom.com>
      CC: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
      CC: Somnath Kotur <somnath.kotur@broadcom.com>
      CC: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
      CC: John Allen <jallen@linux.vnet.ibm.com>
      CC: Guo-Fu Tseng <cooldavid@cooldavid.org>
      CC: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
      CC: Jiri Pirko <jiri@mellanox.com>
      CC: Ido Schimmel <idosch@mellanox.com>
      CC: Manish Chopra <manish.chopra@qlogic.com>
      CC: Sony Chacko <sony.chacko@qlogic.com>
      CC: Rajesh Borundia <rajesh.borundia@qlogic.com>
      CC: Timur Tabi <timur@codeaurora.org>
      CC: Anirudha Sarangi <anirudh@xilinx.com>
      CC: John Linn <John.Linn@xilinx.com>
      Signed-off-by: NJarod Wilson <jarod@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d894be57
    • W
      myri10ge: fix typo in parameter description · 1a61a8f1
      Wei Yongjun 提交于
      Fix typo in parameter description.
      Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1a61a8f1
    • W
      net: ethernet: mediatek: use dev_kfree_skb_any instead of dev_kfree_skb · 81ad2b7d
      Wei Yongjun 提交于
      Replace dev_kfree_skb with dev_kfree_skb_any in mtk_start_xmit()
      which can be called from hard irq context (netpoll) and from
      other contexts. mtk_start_xmit() only frees skbs that it has
      dropped.
      
      This is detected by Coccinelle semantic patch.
      Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      81ad2b7d
    • W
      dwc_eth_qos: use dev_kfree_skb_any instead of dev_kfree_skb · d80f45ff
      Wei Yongjun 提交于
      Replace dev_kfree_skb with dev_kfree_skb_any in dwceqos_start_xmit()
      which can be called from hard irq context (netpoll) and from
      other contexts. dwceqos_start_xmit() only frees skbs that it has
      dropped.
      
      This is detected by Coccinelle semantic patch.
      Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d80f45ff
    • S
      net: phy: aquantia: add PHY ID of AQR106 and AQR107 · 547412fe
      Shaohui Xie 提交于
      The AQR106 and AQR107 can use the existing driver.
      Signed-off-by: NShaohui Xie <Shaohui.Xie@nxp.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      547412fe
    • U
      net: fec: drop check for clk==NULL before calling clk_* · 01e5943a
      Uwe Kleine-König 提交于
      clk_prepare, clk_enable and their counterparts (at least the common clk
      ones, but also most others) do check for the clk being NULL anyhow (and
      return 0 then), so there is no gain when the caller checks, too.
      Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Acked-by: NFugang Duan <fugang.duan@nxp.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      01e5943a
  2. 20 10月, 2016 10 次提交
  3. 19 10月, 2016 12 次提交
  4. 18 10月, 2016 9 次提交
    • D
      Merge branch 'phy-led-triggers' · a8446676
      David S. Miller 提交于
      Zach Brown says:
      
      ====================
      Add support for led triggers on phy link state change
      
      Fix skge driver that declared enum contants that conflicted with enum
      constants in linux/leds.h
      
      Create function that encapsulates actions taken during the adjust phy link step
      of phy state changes.
      
      Create function that provides list of speeds currently supported by the phy.
      
      Add support for led triggers on phy link state changes by adding
      a config option. When set the config option will create a set of led triggers
      for each phy device. Users can use the led triggers to represent link state
      changes on the phy.
      
      v2:
       * New patch that creates phy_adjust_link function to encapsulate actions taken
         when adjusting phy link during phy state changes
       * led trigger speed strings changed to match existing phy speed strings
       * New function that maps speeds to led triggers
       * Replace magic constants with definitions when declaring trigger name
         buffer and number of triggers.
      v3:
       * Changed LED_ON to LED_REG_ON in skge driver to avoid possible future
         conflict and improve consistency.
       * Dropped rtl8712 patch that was accepted separately.
      v4:
       * tweaked commit message
      v5
       * Changed commit message to explain relationship between the new triggers and
         leds driven by phys.
       * Added new patch that creates phy_supported_speeds function.
       * Moved phy_leds_triggers_register and phy_leds_triggers_unregister to
         phy_attach and phy_detach respectively. This change is so the
         phydev->supported field will be filled by the time the triggers are
         registered.
       * Changed hardcoded list of triggers to dynamic list determined by speeds
         return by phy_supported_speeds.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a8446676
    • Z
      net: phy: leds: add support for led triggers on phy link state change · 2e0bc452
      Zach Brown 提交于
      Create an option CONFIG_LED_TRIGGER_PHY (default n), which will create a
      set of led triggers for each instantiated PHY device. There is one LED
      trigger per link-speed, per-phy.
      The triggers are registered during phy_attach and unregistered during
      phy_detach.
      
      This allows for a user to configure their system to allow a set of LEDs
      not controlled by the phy to represent link state changes on the phy.
      LEDS controlled by the phy are unaffected.
      
      For example, we have a board where some of the leds in the
      RJ45 socket are controlled by the phy, but others are not. Using the
      triggers provided by this patch the leds not controlled by the phy can
      be configured to show the current speed of the ethernet connection. The
      leds controlled by the phy are unaffected.
      Signed-off-by: NJosh Cartwright <josh.cartwright@ni.com>
      Signed-off-by: NNathan Sullivan <nathan.sullivan@ni.com>
      Signed-off-by: NZach Brown <zach.brown@ni.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2e0bc452
    • Z
      net: phy: Create phy_supported_speeds function which lists speeds currently... · 1f9127ca
      Zach Brown 提交于
      net: phy: Create phy_supported_speeds function which lists speeds currently supported by a phydevice
      
      phy_supported_speeds provides a means to get a list of all the speeds a
      phy device currently supports.
      Signed-off-by: NZach Brown <zach.brown@ni.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1f9127ca
    • Z
      net: phy: Encapsulate actions performed during link state changes into function phy_adjust_link · 61a17965
      Zach Brown 提交于
      During phy state machine state transitions some set of actions should
      occur whenever the link state changes. These actions should be
      encapsulated into a single function
      
      This patch adds the phy_adjust_link function, which is called whenever
      phydev->adjust_link would have been called before. Actions that should
      occur whenever the phy link is adjusted can now be added to the
      phy_adjust_link function.
      Signed-off-by: NZach Brown <zach.brown@ni.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      61a17965
    • Z
      skge: Rename LED_OFF and LED_ON in marvel skge driver to avoid conflicts with leds namespace · 0e0f27dd
      Zach Brown 提交于
      Adding led support for phy causes namespace conflicts for some
      phy drivers.
      
      The marvel skge driver declared an enum for representing the states of
      Link LED Register. The enum contained constant LED_OFF which conflicted
      with declartation found in linux/leds.h.
      LED_OFF changed to LED_REG_OFF
      Also changed LED_ON to LED_REG_ON to avoid possible future conflict and
      for consistency.
      Signed-off-by: NZach Brown <zach.brown@ni.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0e0f27dd
    • D
      Merge branch 'netdev-adjacency' · 5bb61cb5
      David S. Miller 提交于
      David Ahern says:
      
      ====================
      net: Fix netdev adjacency tracking
      
      The netdev adjacency tracking is failing to create proper dependencies
      for some topologies. For example this topology
      
              +--------+
              |  myvrf |
              +--------+
                |    |
                |  +---------+
                |  | macvlan |
                |  +---------+
                |    |
            +----------+
            |  bridge  |
            +----------+
                |
            +--------+
            | bond1  |
            +--------+
                |
            +--------+
            |  eth3  |
            +--------+
      
      hits 1 of 2 problems depending on the order of enslavement. The base set of
      commands for both cases:
      
          ip link add bond1 type bond
          ip link set bond1 up
          ip link set eth3 down
          ip link set eth3 master bond1
          ip link set eth3 up
      
          ip link add bridge type bridge
          ip link set bridge up
          ip link add macvlan link bridge type macvlan
          ip link set macvlan up
      
          ip link add myvrf type vrf table 1234
          ip link set myvrf up
      
          ip link set bridge master myvrf
      
      Case 1 enslave macvlan to the vrf before enslaving the bond to the bridge:
      
          ip link set macvlan master myvrf
          ip link set bond1 master bridge
      
      Attempts to delete the VRF:
          ip link delete myvrf
      
      trigger the BUG in __netdev_adjacent_dev_remove:
      
      [  587.405260] tried to remove device eth3 from myvrf
      [  587.407269] ------------[ cut here ]------------
      [  587.408918] kernel BUG at /home/dsa/kernel.git/net/core/dev.c:5661!
      [  587.411113] invalid opcode: 0000 [#1] SMP
      [  587.412454] Modules linked in: macvlan bridge stp llc bonding vrf
      [  587.414765] CPU: 0 PID: 726 Comm: ip Not tainted 4.8.0+ #109
      [  587.416766] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
      [  587.420241] task: ffff88013ab6eec0 task.stack: ffffc90000628000
      [  587.422163] RIP: 0010:[<ffffffff813cef03>]  [<ffffffff813cef03>] __netdev_adjacent_dev_remove+0x40/0x12c
      ...
      [  587.446053] Call Trace:
      [  587.446424]  [<ffffffff813d1542>] __netdev_adjacent_dev_unlink+0x20/0x3c
      [  587.447390]  [<ffffffff813d16a3>] netdev_upper_dev_unlink+0xfa/0x15e
      [  587.448297]  [<ffffffffa00003a3>] vrf_del_slave+0x13/0x2a [vrf]
      [  587.449153]  [<ffffffffa00004a4>] vrf_dev_uninit+0xea/0x114 [vrf]
      [  587.450036]  [<ffffffff813d19b0>] rollback_registered_many+0x22b/0x2da
      [  587.450974]  [<ffffffff813d1aac>] unregister_netdevice_many+0x17/0x48
      [  587.451903]  [<ffffffff813de444>] rtnl_delete_link+0x3c/0x43
      [  587.452719]  [<ffffffff813dedcd>] rtnl_dellink+0x180/0x194
      
      When the BUG is converted to a WARN_ON it shows 4 missing adjacencies:
        eth3 - myvrf, mvrf - eth3, bond1 - myvrf and myvrf - bond1
      
      All of those are because the __netdev_upper_dev_link function does not
      properly link macvlan lower devices to myvrf when it is enslaved.
      
      The second case just flips the ordering of the enslavements:
          ip link set bond1 master bridge
          ip link set macvlan master myvrf
      
      Then run:
          ip link delete bond1
          ip link delete myvrf
      
      The vrf delete command hangs because myvrf has a reference that has not
      been released. In this case the removal code does not account for 2 paths
      between eth3 and myvrf - one from bridge to vrf and the other through the
      macvlan.
      
      Rather than try to maintain a linked list of all upper and lower devices
      per netdevice, only track the direct neighbors. The remaining stack can
      be determined by recursively walking the neighbors.
      
      The existing netdev_for_each_all_upper_dev_rcu,
      netdev_for_each_all_lower_dev and netdev_for_each_all_lower_dev_rcu macros
      are replaced with APIs that walk the upper and lower device lists. The
      new APIs take a callback function and a data arg that is passed to the
      callback for each device in the list. Drivers using the old macros are
      converted in separate patches to make it easier on reviewers. It is an
      API conversion only; no functional change is intended.
      
      v3
      - address Stephen's comment to simplify logic and remove typecasts
      
      v2
      - fixed bond0 references in cover-letter
      - fixed definition of netdev_next_lower_dev_rcu to mirror the upper_dev
        version.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5bb61cb5
    • D
      net: dev: Improve debug statements for adjacency tracking · 67b62f98
      David Ahern 提交于
      Adjacency code only has debugs for the insert case. Add debugs for
      the remove path and make both consistently worded to make it easier
      to follow the insert and removal with reference counts.
      
      In addition, change the BUG to a WARN_ON. A missing adjacency at
      removal time is not cause for a panic.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      67b62f98
    • D
      net: Add warning if any lower device is still in adjacency list · 0f524a80
      David Ahern 提交于
      Lower list should be empty just like upper.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0f524a80
    • D
      net: Remove all_adj_list and its references · f1170fd4
      David Ahern 提交于
      Only direct adjacencies are maintained. All upper or lower devices can
      be learned via the new walk API which recursively walks the adj_list for
      upper devices or lower devices.
      Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f1170fd4