1. 23 6月, 2015 27 次提交
    • D
      Merge branch 'dsa-mv88e6xxx-debugfs' · 824831fa
      David S. Miller 提交于
      Andrew Lunn says:
      
      ====================
      debugfs for mv88e6xxx
      
      This patchset adds some debugfs files for seeing into a mv88e6xxx
      family of switch chips.
      
      DB   T/P  Vec State Addr
      003  Port 008   7   00:22:02:00:18:44
      003  Port 008   6   80:ee:73:83:60:27
      005  Port 020   7   94:10:3e:80:bc:f3
      0f8  Port 001   6   8e:25:13:53:44:de
      
      This walks all possible entries, so is a bit slow, but is always
      correct.
      
      Target Port
         0   15
         1   15
         2   15
         3   15
         4   15
         5   15
         6   15
         7   15
         8   15
         9   15
      -->snip<--
        31   15
      
      A rather boring example, since i only have one switch here. But this shows
      the routing between multiple switches.
      
          GLOBAL GLOBAL2   0    1    2    3    4    5    6
       0:  c804       0  1e4f 100f 100f 1e4f 1e0f  e07  e07
       1:    fe       0     3    3    3    3    3 c03e c03f
       2:     0    ffff     0    0    0    0    0    0    0
       3:     0    ffff  1721 1721 1721 1721 1721 1721 1721
       4:  6000     258   433  431  431  433  433 373f  433
       5:     0      ff     0    0    0    0    0    0    0
       6:  c000    1f0f  2026 2025 2023 3020 4020 501f 6020
       7:     0    707f     0    0    0    0    0    0    0
       8:     0    7800  2080 2080 2080 2080 2080 2080 2080
       9:     0    1600     1    1    1    1    1    1    1
       a:   148       0     0    0    0    0    0    0    0
       b:  4000    1000     1    2    4    8   10   20   40
       c:     0      7f     0    0    0    0    0    0    0
       d:  ffff     5f3     0    0    0    0    0    0    0
       e:  ffff       6     0    0    0    0    0    0    0
       f:  ffff     f00  dada dada dada dada dada dada dada
      10:     0       0     0    0    0    0    0    0    0
      11:     0       0     0    0    0    0    0    0    0
      12:  5555       0     0    0    0    0    0    0    0
      13:  5555       0    1a    0    0 1df0    0 1e07    0
      14:  aaaa     400     0    0    0    0    0    0    0
      15:  aaaa       0     0    0    0    0    0    0    0
      16:  ffff       0  6011 6011 6011 6011   33   33    0
      17:  ffff       0     0    0    0    0    0    0    0
      18:  fa41    1844  3210 3210 3210 3210 3210 3210 3210
      19:     0     1e1  7654 7654 7654 7654 7654 7654 7654
      1a:  5550       0     0    0    0    0    0    0    0
      1b:   1fb    f869  8000 8000 8000 8000 8000 8000 8000
      1c:     0       0     0    0    0    0    0    0    0
      1d:   c00       0     0    0    0    0    0    0    0
      1e:     0       0     0    0    0    0    0    0    0
      1f:     0       0     0    0    0    0    0    0    0
      
      All the switch registers which are directly accessible.
      
            Statistic       Port  0  Port  1  Port  2  Port  3  Port  4  Port  5  Port 6
           in_good_octets:     2176        0        0  4263711        0   499540       0
            in_bad_octets:    46050        0        0    50196        0        0       0
               in_unicast:        0        0        0     7693        0     7691       0
            in_broadcasts:        0        0        0        0        0        3       0
            in_multicasts:       34        0        0        0        0       27       0
                 in_pause:        0        0        0        0        0        0       0
             in_undersize:        0        0        0        0        0        0       0
             in_fragments:       45        0        0        2        0        0       0
              in_oversize:        0        0        0        0        0        0       0
                in_jabber:        0        0        0        0        0        0       0
              in_rx_error:        0        0        0        0        0        0       0
             in_fcs_error:      159        0        0       37        0        0       0
               out_octets:      808        0        0   496608      336  4267159       0
              out_unicast:        0        0        0     7691        0     7693       0
           out_broadcasts:        1        0        0        3        0        0       0
           out_multicasts:        9        0        0        6        4       34       0
                out_pause:        0        0        0        0        0        0       0
                excessive:        0        0        0        0        0        0       0
               collisions:        0        0        0        0        0        0       0
                 deferred:        0        0        0        0        0        0       0
                   single:        0        0        0        0        0        0       0
                 multiple:        0        0        0        0        0        0       0
            out_fcs_error:        0        0        0        0        0        0       0
                     late:        0        0        0        0        0        0       0
             hist_64bytes:       36        0        0     7577        0     7574       0
         hist_65_127bytes:       53        0        0      241        4      298       0
        hist_128_255bytes:       50        0        0       12        0       10       0
        hist_256_511bytes:       43        0        0        8        0        2       0
       hist_512_1023bytes:       18        0        0     7573        0     7564       0
      hist_1024_max_bytes:        3        0        0       19        0        0       0
           sw_in_discards:        0        0        0        0        0        0       0
           sw_in_filtered:        0        0        0        0        0        0       0
          sw_out_filtered:       34        0        0     7693        0     7721       0
      
      Of particular interest here is that you get to see all ports,
      including the CPU port and any DSA ports. You cannot get statistics
      for these ports via ethtool.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      824831fa
    • A
      dsa: mv88x6xxx: Add debugfs interface for scratch registers · 56d95e22
      Andrew Lunn 提交于
      Allow the contents of the scratch registers to be shown in debugfs.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      56d95e22
    • A
      dsa: mv88x6xxx: Add debugfs interface for device map · d35bd876
      Andrew Lunn 提交于
      The device map is used to route packets between cascaded switches.
      Add dumping a switches device map via debugfs.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d35bd876
    • A
      dsa: mv88x6xxx: Add debugfs interface for statistics · 532c7a35
      Andrew Lunn 提交于
      Allow the contents of the statistics counters to be shown in debugfs.
      This is particularly useful for the cpu and dsa ports, which cannot be
      seen using ethtools -S.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      532c7a35
    • A
      dsa: mv88x6xxx: Refactor getting a single statistic · 80c4627b
      Andrew Lunn 提交于
      Move the code to retrieve a statistics counter into a function of its
      own, so it can later be reused.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      80c4627b
    • A
      dsa: mv88e6xxx: Add debugfs interface for ATU · 8a0a265d
      Andrew Lunn 提交于
      Dump the Address Translation Unit via a file in debugfs.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8a0a265d
    • A
      dsa: mv88e6xxx: Add debugfs interface for registers · 87c8cefb
      Andrew Lunn 提交于
      Allow the contents of the registers to be shown in debugfs.
      Signed-off-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      87c8cefb
    • S
      vmxnet3: Changes for vmxnet3 adapter version 2 (fwd) · 45dac1d6
      Shreyas Bhatewara 提交于
      Make the driver understand adapter version 2.
      
      Cc: Rachel Lunnon <rachel_lunnon@stormagic.com>
      Signed-off-by: NGuolin Yang <gyang@vmware.com>
      Signed-off-by: NShreyas N Bhatewara <sbhatewara@vmware.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      45dac1d6
    • S
      vmxnet3: Fix memory leaks in rx path (fwd) · c41fcce9
      Shreyas Bhatewara 提交于
      If rcd length was zero, the page used for frag was not being released. It
      was being replaced with a newly allocated page. This change takes care
      of that memory leak.
      Signed-off-by: NGuolin Yang <gyang@vmware.com>
      Signed-off-by: NShreyas N Bhatewara <sbhatewara@vmware.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c41fcce9
    • S
      vmxnet3: Register shutdown handler for device (fwd) · e9ba47bf
      Shreyas Bhatewara 提交于
      Implement a handler for pci shutdown so that the driver has an
      opportunity to make sure that device is quiesced before the PCI
      switches to legacy IRQs. This way the possibility of
      "screaming interrupt" is avoided.
      Acked-by: NShrikrishna Khare <skhare@vmware.com>
      Signed-off-by: NShreyas N Bhatewara <sbhatewara@vmware.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e9ba47bf
    • E
      netfilter: nf_qeueue: Drop queue entries on nf_unregister_hook · 8405a8ff
      Eric W. Biederman 提交于
      Add code to nf_unregister_hook to flush the nf_queue when a hook is
      unregistered.  This guarantees that the pointer that the nf_queue code
      retains into the nf_hook list will remain valid while a packet is
      queued.
      
      I tested what would happen if we do not flush queued packets and was
      trivially able to obtain the oops below.  All that was required was
      to stop the nf_queue listening process, to delete all of the nf_tables,
      and to awaken the nf_queue listening process.
      
      > BUG: unable to handle kernel paging request at 0000000100000001
      > IP: [<0000000100000001>] 0x100000001
      > PGD b9c35067 PUD 0
      > Oops: 0010 [#1] SMP
      > Modules linked in:
      > CPU: 0 PID: 519 Comm: lt-nfqnl_test Not tainted
      > task: ffff8800b9c8c050 ti: ffff8800ba9d8000 task.ti: ffff8800ba9d8000
      > RIP: 0010:[<0000000100000001>]  [<0000000100000001>] 0x100000001
      > RSP: 0018:ffff8800ba9dba40  EFLAGS: 00010a16
      > RAX: ffff8800bab48a00 RBX: ffff8800ba9dba90 RCX: ffff8800ba9dba90
      > RDX: ffff8800b9c10128 RSI: ffff8800ba940900 RDI: ffff8800bab48a00
      > RBP: ffff8800b9c10128 R08: ffffffff82976660 R09: ffff8800ba9dbb28
      > R10: dead000000100100 R11: dead000000200200 R12: ffff8800ba940900
      > R13: ffffffff8313fd50 R14: ffff8800b9c95200 R15: 0000000000000000
      > FS:  00007fb91fc34700(0000) GS:ffff8800bfa00000(0000) knlGS:0000000000000000
      > CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      > CR2: 0000000100000001 CR3: 00000000babfb000 CR4: 00000000000007f0
      > Stack:
      >  ffffffff8206ab0f ffffffff82982240 ffff8800bab48a00 ffff8800b9c100a8
      >  ffff8800b9c10100 0000000000000001 ffff8800ba940900 ffff8800b9c10128
      >  ffffffff8206bd65 ffff8800bfb0d5e0 ffff8800bab48a00 0000000000014dc0
      > Call Trace:
      >  [<ffffffff8206ab0f>] ? nf_iterate+0x4f/0xa0
      >  [<ffffffff8206bd65>] ? nf_reinject+0x125/0x190
      >  [<ffffffff8206dee5>] ? nfqnl_recv_verdict+0x255/0x360
      >  [<ffffffff81386290>] ? nla_parse+0x80/0xf0
      >  [<ffffffff8206c42c>] ? nfnetlink_rcv_msg+0x13c/0x240
      >  [<ffffffff811b2fec>] ? __memcg_kmem_get_cache+0x4c/0x150
      >  [<ffffffff8206c2f0>] ? nfnl_lock+0x20/0x20
      >  [<ffffffff82068159>] ? netlink_rcv_skb+0xa9/0xc0
      >  [<ffffffff820677bf>] ? netlink_unicast+0x12f/0x1c0
      >  [<ffffffff82067ade>] ? netlink_sendmsg+0x28e/0x650
      >  [<ffffffff81fdd814>] ? sock_sendmsg+0x44/0x50
      >  [<ffffffff81fde07b>] ? ___sys_sendmsg+0x2ab/0x2c0
      >  [<ffffffff810e8f73>] ? __wake_up+0x43/0x70
      >  [<ffffffff8141a134>] ? tty_write+0x1c4/0x2a0
      >  [<ffffffff81fde9f4>] ? __sys_sendmsg+0x44/0x80
      >  [<ffffffff823ff8d7>] ? system_call_fastpath+0x12/0x6a
      > Code:  Bad RIP value.
      > RIP  [<0000000100000001>] 0x100000001
      >  RSP <ffff8800ba9dba40>
      > CR2: 0000000100000001
      > ---[ end trace 08eb65d42362793f ]---
      
      Cc: stable@vger.kernel.org
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8405a8ff
    • E
      netfilter: nftables: Do not run chains in the wrong network namespace · fdab6a4c
      Eric W. Biederman 提交于
      Currenlty nf_tables chains added in one network namespace are being
      run in all network namespace.  The issues are myriad with the simplest
      being an unprivileged user can cause any network packets to be dropped.
      
      Address this by simply not running nf_tables chains in the wrong
      network namespace.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Acked-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fdab6a4c
    • P
      macvtap: Increase limit of macvtap queues · dfe816c5
      Pankaj Gupta 提交于
      Macvtap should be compatible with tuntap for
      maximum number of queues.
      
      commit 'baf71c5c (tuntap:
      Increase the number of queues in tun.)' removes
      the limitations and increases number of queues in tuntap.
      Now, Its safe to increase number of queues in Macvtap as well.
      
      This patch also modifies 'macvtap_del_queues' function
      to avoid extra memory allocation in stack.
      
      Changes from v1->v2 :
      Michael S. Tsirkin, Jason Wang  :
                        Better way to use linked list to
      avoid use of extra memory in stack.
      Sergei Shtylyov : Specify dependent commit's summary.
      Signed-off-by: NPankaj Gupta <pagupta@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dfe816c5
    • D
      bpf: BPF based latency tracing · 0fb1170e
      Daniel Wagner 提交于
      BPF offers another way to generate latency histograms. We attach
      kprobes at trace_preempt_off and trace_preempt_on and calculate the
      time it takes to from seeing the off/on transition.
      
      The first array is used to store the start time stamp. The key is the
      CPU id. The second array stores the log2(time diff). We need to use
      static allocation here (array and not hash tables). The kprobes
      hooking into trace_preempt_on|off should not calling any dynamic
      memory allocation or free path. We need to avoid recursivly
      getting called. Besides that, it reduces jitter in the measurement.
      
      CPU 0
            latency        : count     distribution
             1 -> 1        : 0        |                                        |
             2 -> 3        : 0        |                                        |
             4 -> 7        : 0        |                                        |
             8 -> 15       : 0        |                                        |
            16 -> 31       : 0        |                                        |
            32 -> 63       : 0        |                                        |
            64 -> 127      : 0        |                                        |
           128 -> 255      : 0        |                                        |
           256 -> 511      : 0        |                                        |
           512 -> 1023     : 0        |                                        |
          1024 -> 2047     : 0        |                                        |
          2048 -> 4095     : 166723   |*************************************** |
          4096 -> 8191     : 19870    |***                                     |
          8192 -> 16383    : 6324     |                                        |
         16384 -> 32767    : 1098     |                                        |
         32768 -> 65535    : 190      |                                        |
         65536 -> 131071   : 179      |                                        |
        131072 -> 262143   : 18       |                                        |
        262144 -> 524287   : 4        |                                        |
        524288 -> 1048575  : 1363     |                                        |
      CPU 1
            latency        : count     distribution
             1 -> 1        : 0        |                                        |
             2 -> 3        : 0        |                                        |
             4 -> 7        : 0        |                                        |
             8 -> 15       : 0        |                                        |
            16 -> 31       : 0        |                                        |
            32 -> 63       : 0        |                                        |
            64 -> 127      : 0        |                                        |
           128 -> 255      : 0        |                                        |
           256 -> 511      : 0        |                                        |
           512 -> 1023     : 0        |                                        |
          1024 -> 2047     : 0        |                                        |
          2048 -> 4095     : 114042   |*************************************** |
          4096 -> 8191     : 9587     |**                                      |
          8192 -> 16383    : 4140     |                                        |
         16384 -> 32767    : 673      |                                        |
         32768 -> 65535    : 179      |                                        |
         65536 -> 131071   : 29       |                                        |
        131072 -> 262143   : 4        |                                        |
        262144 -> 524287   : 1        |                                        |
        524288 -> 1048575  : 364      |                                        |
      CPU 2
            latency        : count     distribution
             1 -> 1        : 0        |                                        |
             2 -> 3        : 0        |                                        |
             4 -> 7        : 0        |                                        |
             8 -> 15       : 0        |                                        |
            16 -> 31       : 0        |                                        |
            32 -> 63       : 0        |                                        |
            64 -> 127      : 0        |                                        |
           128 -> 255      : 0        |                                        |
           256 -> 511      : 0        |                                        |
           512 -> 1023     : 0        |                                        |
          1024 -> 2047     : 0        |                                        |
          2048 -> 4095     : 40147    |*************************************** |
          4096 -> 8191     : 2300     |*                                       |
          8192 -> 16383    : 828      |                                        |
         16384 -> 32767    : 178      |                                        |
         32768 -> 65535    : 59       |                                        |
         65536 -> 131071   : 2        |                                        |
        131072 -> 262143   : 0        |                                        |
        262144 -> 524287   : 1        |                                        |
        524288 -> 1048575  : 174      |                                        |
      CPU 3
            latency        : count     distribution
             1 -> 1        : 0        |                                        |
             2 -> 3        : 0        |                                        |
             4 -> 7        : 0        |                                        |
             8 -> 15       : 0        |                                        |
            16 -> 31       : 0        |                                        |
            32 -> 63       : 0        |                                        |
            64 -> 127      : 0        |                                        |
           128 -> 255      : 0        |                                        |
           256 -> 511      : 0        |                                        |
           512 -> 1023     : 0        |                                        |
          1024 -> 2047     : 0        |                                        |
          2048 -> 4095     : 29626    |*************************************** |
          4096 -> 8191     : 2704     |**                                      |
          8192 -> 16383    : 1090     |                                        |
         16384 -> 32767    : 160      |                                        |
         32768 -> 65535    : 72       |                                        |
         65536 -> 131071   : 32       |                                        |
        131072 -> 262143   : 26       |                                        |
        262144 -> 524287   : 12       |                                        |
        524288 -> 1048575  : 298      |                                        |
      
      All this is based on the trace3 examples written by
      Alexei Starovoitov <ast@plumgrid.com>.
      Signed-off-by: NDaniel Wagner <daniel.wagner@bmw-carit.de>
      Cc: Alexei Starovoitov <ast@plumgrid.com>
      Cc: Alexei Starovoitov <ast@plumgrid.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Daniel Borkmann <daniel@iogearbox.net>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: linux-kernel@vger.kernel.org
      Cc: netdev@vger.kernel.org
      Acked-by: NAlexei Starovoitov <ast@plumgrid.com>
      Acked-by: NDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0fb1170e
    • N
      bridge: multicast: start querier timer when running user-space stp · 7ce42de1
      Nikolay Aleksandrov 提交于
      When STP is running in user-space and querier is configured, the
      querier timer is not started when a port goes to a non-blocking state.
      This patch unifies the user- and kernel-space stp multicast port enable
      path and enables it in all states different from blocking. Note that when a
      port goes in BR_STATE_DISABLED it's not enabled because that is handled
      in the beginning of the port list loop.
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Acked-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7ce42de1
    • D
      Merge tag 'nfc-next-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · b1dfe0a8
      David S. Miller 提交于
      NFC 4.2 2nd pull request
      
      This one only contains a one liner fix for a typo that I
      introduced while cleaning some of the nfcmrvl patches that
      were part of the 1st 4.2 pull request.
      b1dfe0a8
    • D
      Merge branch 'for-upstream' of... · bfdc8dbd
      David S. Miller 提交于
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2015-06-18
      
      Here's the final bluetooth-next pull request for 4.2.
      
       - Cleanups & fixes to 802.15.4 code and related drivers
       - Fix btusb driver memory leak
       - New USB IDs for Atheros controllers
       - Support for BCM4324B3 UART based Broadcom controller
       - Fix for Bluetooth encryption key size handling
       - Broadcom controller initialization fixes
       - Support for Intel controller DDC parameters
       - Support for multiple Bluetooth LE advertising instances
       - Fix for HCI user channel cleanup path
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bfdc8dbd
    • M
      bonding: Display LACP info only to CAP_NET_ADMIN capable user · 4cd6b475
      Mahesh Bandewar 提交于
      Actor and Partner details can be accessed via proc-fs, sys-fs
      entries or netlink interface. These interfaces are world readable
      at this moment. The earlier patch-series made the LACP communication
      secure to avoid nuisance attack from within the same L2 domain but
      it did not prevent "someone unprivileged" looking at that information
      on host and perform the same act.
      
      This patch essentially avoids spitting those entries if the user
      in question does not have enough privileges.
      Signed-off-by: NMahesh Bandewar <maheshb@google.com>
      Signed-off-by: NAndy Gospodarek <gospo@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4cd6b475
    • D
      Merge branch 'macb-sama5d2' · 1f02c09b
      David S. Miller 提交于
      Nicolas Ferre says:
      
      ====================
      net/macb: add sama5d2 support
      
      This series is basically the support for another flavor of the GEM IP
      configuration. It ended up being a series because of some little fixes made to
      the binding documentation before adding the new compatibility string.
      
      Bye,
      
      v2: - fix bindings
          - add sama5d2 compatibility string to the binding documentation
      ====================
      Acked-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1f02c09b
    • C
      net/macb: add config for Atmel sama5d2 SoCs · 5c8fe711
      Cyrille Pitchen 提交于
      Add the compatible string for Atmel sama5d2 SoC family as the configuration
      options differ from other instances of the GEM.
      Signed-off-by: NCyrille Pitchen <cyrille.pitchen@atmel.com>
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5c8fe711
    • N
      net/macb: bindings doc: add sama5d2 compatibility sting · bb7506c9
      Nicolas Ferre 提交于
      Add sama5d2 to the biding documentation for this use of the GEM IP.
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bb7506c9
    • N
      net/macb: bindings doc/trivial: fix sama5d4 comment · f58393f4
      Nicolas Ferre 提交于
      On sama5d4, we only have a GEM IP that is configured to do 10/100 Mbits. So the
      use of "Gigabit" can be confusing.
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f58393f4
    • N
      net/macb: bindings doc: fix compatibility string · f76a28c2
      Nicolas Ferre 提交于
      In the driver and the DT bindings we use the "atmel" prefix. Fix it in the
      binding documentation.
      Signed-off-by: NNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f76a28c2
    • H
      inet_diag: Remove _bh suffix in inet_diag_dump_reqs(). · 3b188443
      Hiroaki SHIMODA 提交于
      inet_diag_dump_reqs() is called from inet_diag_dump_icsk() with BH
      disabled. So no need to disable BH in inet_diag_dump_reqs().
      Signed-off-by: NHiroaki Shimoda <shimoda.hiroaki@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3b188443
    • S
      net/phy: Add support for Realtek RTL8211F · 3447cf2e
      Shengzhou Liu 提交于
      RTL8211F has different register definitions from RTL8211E.
      Specially it needs to enable TXDLY in case of RGMII.
      Signed-off-by: NShengzhou Liu <Shengzhou.Liu@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3447cf2e
    • D
      Merge tag 'wireless-drivers-next-for-davem-2015-06-18' of... · fa433354
      David S. Miller 提交于
      Merge tag 'wireless-drivers-next-for-davem-2015-06-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
      
      Kalle Valo says:
      
      ====================
      Major changes:
      
      mwifiex:
      
      * enhancements for AP mode: support verbose information in station
        dump command and also information about AP link.
      * enable power save by default
      
      brcmfmac:
      
      * fix module reload issue for PCIe
      * improving msgbuf protocol for PCIe devices
      * rework .get_station() cfg80211 callback operation
      * determine interface combinations upon device feature support
      
      ath9k:
      
      * ath9k_htc: add support of channel switch
      
      wil6210:
      
      * add modparam for bcast ring size
      * support hidden SSID
      * add per-MCS Rx stats
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fa433354
    • S
      switchdev: fdb filter_dev is always NULL for self (device), so remove check · 10ea5165
      Scott Feldman 提交于
      Remove the filter_dev check when dumping fdb entries, otherwise dump
      returns empty list.  filter_dev is always passed as NULL when dumping fdbs
      on SELF.  We want the fdbs installed on the device to be listed in the
      dump.
      Signed-off-by: NScott Feldman <sfeldma@gmail.com>
      Fixes: 45d4122c ("switchdev: add support for fdb add/del/dump via switchdev_port_obj ops")
      Acked-by: NSridhar Samudrala <sridhar.samudrala@intel.com>
      Acked-by: NJiri Pirko <jiri@resnulli.us>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      10ea5165
  2. 22 6月, 2015 13 次提交