1. 10 Jul, 2014 17 commits
    • Varka Bhadram's avatar
      net: cpmac: fix in debug messages · ff32045e
      Varka Bhadram authored
      This patch fix the debug message format. This patch changes to the
      commit f160a2d0: net: cpmac: dynamic debug fixes
      
      When we use pr_debug()/netdev_dbg() new lines are inserting in b/w
      the values. The format when i use the printk()
      
      These formats used in skb dump and reg dump. This functions
      called from the entire code. So this will be enabled all the lines.
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ff32045e
    • David S. Miller's avatar
      Merge branch 'bridge-fdb-dump-filter' · 51b5bd19
      David S. Miller authored
      Jamal Hadi Salim says:
      
      ====================
      bridge: fdb dumping takes a filter device
      
      v7:
      Vxlan driver was not updated with new API. Found by DaveM
      
      v6:
      Missed checkpatch > 80 chars lines found by Varka Bhadram
      
      v5:
       Embarassing qlnic compile failure found by DaveM
      
      v4:
       Request from DaveM to use proper comment tagging and remove if-stmnt braces
      
      V3:
       Suggestion from Eric D. to use for_each_netdev
       Suggestion from Stephen H. to reduce level of indentation
      
      V2:
      Suggestions from Vlad
       Get rid of rcu read lock since rtnl_lock is being held
       simplify for readability
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      51b5bd19
    • Jamal Hadi Salim's avatar
      bridge: netlink dump interface at par with brctl · 5e6d2435
      Jamal Hadi Salim authored
      Actually better than brctl showmacs because we can filter by bridge
      port in the kernel.
      The current bridge netlink interface doesnt scale when you have many
      bridges each with large fdbs or even bridges with many bridge ports
      
      And now for the science non-fiction novel you have all been
      waiting for..
      
      //lets see what bridge ports we have
      root@moja-1:/configs/may30-iprt/bridge# ./bridge link show
      8: eth1 state DOWN : <BROADCAST,MULTICAST> mtu 1500 master br0 state
      disabled priority 32 cost 19
      17: sw1-p1 state DOWN : <BROADCAST,NOARP> mtu 1500 master br0 state
      disabled priority 32 cost 100
      
      // show all..
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show
      33:33:00:00:00:01 dev bond0 self permanent
      33:33:00:00:00:01 dev dummy0 self permanent
      33:33:00:00:00:01 dev ifb0 self permanent
      33:33:00:00:00:01 dev ifb1 self permanent
      33:33:00:00:00:01 dev eth0 self permanent
      01:00:5e:00:00:01 dev eth0 self permanent
      33:33:ff:22:01:01 dev eth0 self permanent
      02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:07 dev eth1 self permanent
      33:33:00:00:00:01 dev eth1 self permanent
      33:33:00:00:00:01 dev gretap0 self permanent
      da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      
      //filter by bridge
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br br0
      02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:07 dev eth1 self permanent
      33:33:00:00:00:01 dev eth1 self permanent
      da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      
      // bridge sw1 has no ports attached..
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br sw1
      
      //filter by port
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show brport eth1
      02:00:00:12:01:02 vlan 0 master br0 permanent
      00:17:42:8a:b4:05 vlan 0 master br0 permanent
      00:17:42:8a:b4:07 self permanent
      33:33:00:00:00:01 self permanent
      
      // filter by port + bridge
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br br0 brport
      sw1-p1
      da:ac:46:27:d9:53 vlan 0 master br0 permanent
      33:33:00:00:00:01 self permanent
      
      // for shits and giggles (as they say in New Brunswick), lets
      // change the mac that br0 uses
      // Note: a magical fdb entry with no brport is added ...
      root@moja-1:/configs/may30-iprt/bridge# ip link set dev br0 address
      02:00:00:12:01:04
      
      // lets see if we can see the unicorn ..
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show
      33:33:00:00:00:01 dev bond0 self permanent
      33:33:00:00:00:01 dev dummy0 self permanent
      33:33:00:00:00:01 dev ifb0 self permanent
      33:33:00:00:00:01 dev ifb1 self permanent
      33:33:00:00:00:01 dev eth0 self permanent
      01:00:5e:00:00:01 dev eth0 self permanent
      33:33:ff:22:01:01 dev eth0 self permanent
      02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:07 dev eth1 self permanent
      33:33:00:00:00:01 dev eth1 self permanent
      33:33:00:00:00:01 dev gretap0 self permanent
      02:00:00:12:01:04 dev br0 vlan 0 master br0 permanent <=== there it is
      da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      
      //can we see it if we filter by bridge?
      root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br br0
      02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent
      00:17:42:8a:b4:07 dev eth1 self permanent
      33:33:00:00:00:01 dev eth1 self permanent
      02:00:00:12:01:04 dev br0 vlan 0 master br0 permanent <=== there it is
      da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5e6d2435
    • Jamal Hadi Salim's avatar
      bridge: fdb dumping takes a filter device · 5d5eacb3
      Jamal Hadi Salim authored
      Dumping a bridge fdb dumps every fdb entry
      held. With this change we are going to filter
      on selected bridge port.
      Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5d5eacb3
    • hayeswang's avatar
      r8152: support jumbo frame for RTL8153 · 69b4b7a4
      hayeswang authored
      The maximum jumbo frame size for RTL8153 is 9K bytes.
      Change the max rx packet size to 9K.
      Change the use of the shared fifo from 6K (default) to 12K for tx.
      Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      69b4b7a4
    • David S. Miller's avatar
      Merge branch 'cpmac-next' · d6700790
      David S. Miller authored
      Varka Bhadram says:
      
      ====================
      This patch series cleanup for AR7 CPMAC Ethernet controller driver
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d6700790
    • Varka Bhadram's avatar
      net: cpmac: fix in releasing resources · 0465be8f
      Varka Bhadram authored
      before registering the the net device this code freeing net device
      by using the label 'fail'
      
      fixed by introducing an another label 'out'
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0465be8f
    • Varka Bhadram's avatar
      net: cpmac: fix proper spacing before return statement · 55064efd
      Varka Bhadram authored
      This patch insert proper spaces before return statement.
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      55064efd
    • Varka Bhadram's avatar
      net: cpmac: fix missing a blank line after declarations · 59329d8b
      Varka Bhadram authored
      This patch insert a blank line after declaration
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      59329d8b
    • Varka Bhadram's avatar
      net: cpmac: fix cpmac driver structure · 96a8d3c1
      Varka Bhadram authored
      This patch changes to style of declarattion which follows every driver
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      96a8d3c1
    • Varka Bhadram's avatar
      net: cpmac: dynamic debug fixes · f160a2d0
      Varka Bhadram authored
      This patch does the following changes
      1. convert printk(KERN_DEBUG.. to netdev_dbg() if we have net_device object
         or convert to dev_dbg() if we have device object.
      2. convert printk(KERN_WARNING.. to netdev_warn() if we have net_device object
         or convert to dev_warn() if we have device object
      3. convert printk() to pr_*
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f160a2d0
    • Varka Bhadram's avatar
      net: cpmac: fix comments · 8bcd5c6d
      Varka Bhadram authored
      This patch convert the normal comments to networking subsystem
      style comments.
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8bcd5c6d
    • Varka Bhadram's avatar
      net: cpmac: remove space in macro defination · af595154
      Varka Bhadram authored
      This patch fix the space after '#' in macro defination
      Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      af595154
    • David S. Miller's avatar
      ipconfig: Only bootp paths should reference ic_dev_xid. · 405fd707
      David S. Miller authored
      It is only tested, and declared, in the bootp code.
      
      So, in ic_dynamic() guard it's setting with IPCONFIG_BOOTP.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      405fd707
    • David S. Miller's avatar
      Merge branch 'systemport-next' · 5edbf7df
      David S. Miller authored
      Florian Fainelli says:
      
      ====================
      net: systemport: checkpatch fixes
      
      These two patches fixes the multiple line alignment issues and
      kzalloc on array reported by checkpatch.pl
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5edbf7df
    • Florian Fainelli's avatar
      net: systemport: use kcalloc instead of kzalloc · 40a8a317
      Florian Fainelli authored
      checkpatch.pl flagged two uses of kzalloc() for allocating and zeroing
      arrays, use kcalloc() instead as recommended.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      40a8a317
    • Florian Fainelli's avatar
      net: systemport: align multiple lines correctly · 23acb2fc
      Florian Fainelli authored
      checkpatch.pl flagged a bunch of: "CHECK: Alignment should match open
      parenthesis" problems, fix all of them.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      23acb2fc
  2. 09 Jul, 2014 23 commits