提交 · cbda10fa97d72c7a1923be4426171aa90e8c6dab · openeuler / Kernel

20 1月, 2011 6 次提交

net_device: add support for network device groups · cbda10fa

由 Vlad Dogaru 提交于 1月 13, 2011

Net devices can now be grouped, enabling simpler manipulation from
userspace. This patch adds a group field to the net_device structure, as
well as rtnetlink support to query and modify it.
Signed-off-by: NVlad Dogaru <ddvlad@rosedu.org>
Acked-by: NJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

cbda10fa

net: cleanup unused macros in net directory · 441c793a

由 Shan Wei 提交于 1月 13, 2011

Clean up some unused macros in net/*.
1. be left for code change. e.g. PGV_FROM_VMALLOC, PGV_FROM_VMALLOC, KMEM_SAFETYZONE.
2. never be used since introduced to kernel.
   e.g. P9_RDMA_MAX_SGE, UTIL_CTRL_PKT_SIZE.
Signed-off-by: NShan Wei <shanwei@cn.fujitsu.com>
Acked-by: NSjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

441c793a

vxge: update driver version · 6997e618

由 Jon Mason 提交于 1月 18, 2011

Update vxge driver version to 2.5.2
Signed-off-by: NJon Mason <jon.mason@exar.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

6997e618

vxge: MSIX one shot mode · 16fded7d

由 Jon Mason 提交于 1月 18, 2011

To reduce the possibility of losing an interrupt in the handler due to a
race between an interrupt processing and disable/enable of interrupts,
enable MSIX one shot.

Also, add support for adaptive interrupt coalesing
Signed-off-by: NJon Mason <jon.mason@exar.com>
Signed-off-by: NMasroor Vettuparambil <masroor.vettuparambil@exar.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

16fded7d

vxge: correct eprom version detection · 1d15f81c

由 Jon Mason 提交于 1月 18, 2011

The firmware PXE EPROM version detection is failing due to passing the
wrong parameter into firmware query function.  Also, the version
printing function has an extraneous newline.
Signed-off-by: NJon Mason <jon.mason@exar.com>
Signed-off-by: NSivakumar Subramani <sivakumar.subramani@exar.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

1d15f81c

vxge: cleanup probe error paths · 6cca2003

由 Jon Mason 提交于 1月 18, 2011

Reorder the commands to be in the inverse order of their allocations
(instead of the random order they appear to be in), propagate return
code on errors from pci_request_region and register_netdev, reduce the
config_dev_cnt and total_dev_cnt counters on remove, and return the
correct error code for vdev->vpaths kzalloc failures.  Also, prevent
leaking of vdev->vpaths memory and netdev in vxge_probe error path due
to freeing for these not occurring in vxge_device_unregister.
Signed-off-by: NJon Mason <jon.mason@exar.com>
Signed-off-by: NSivakumar Subramani <sivakumar.subramani@exar.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

6cca2003

19 1月, 2011 34 次提交

net: filter: dont block softirqs in sk_run_filter() · 80f8f102

由 Eric Dumazet 提交于 1月 18, 2011

Packet filter (BPF) doesnt need to disable softirqs, being fully
re-entrant and lock-less.
Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

80f8f102

af_unix: implement socket filter · d6ae3bae

由 Alban Crequy 提交于 1月 18, 2011

Linux Socket Filters can already be successfully attached and detached on unix
sockets with setsockopt(sockfd, SOL_SOCKET, SO_{ATTACH,DETACH}_FILTER, ...).
See: Documentation/networking/filter.txt

But the filter was never used in the unix socket code so it did not work. This
patch uses sk_filter() to filter buffers before delivery.

This short program demonstrates the problem on SOCK_DGRAM.

int main(void) {
  int i, j, ret;
  int sv[2];
  struct pollfd fds[2];
  char *message = "Hello world!";
  char buffer[64];
  struct sock_filter ins[32] = {{0,},};
  struct sock_fprog filter;

  socketpair(AF_UNIX, SOCK_DGRAM, 0, sv);

  for (i = 0 ; i < 2 ; i++) {
    fds[i].fd = sv[i];
    fds[i].events = POLLIN;
    fds[i].revents = 0;
  }

  for(j = 1 ; j < 13 ; j++) {

    /* Set a socket filter to truncate the message */
    memset(ins, 0, sizeof(ins));
    ins[0].code = BPF_RET|BPF_K;
    ins[0].k = j;
    filter.len = 1;
    filter.filter = ins;
    setsockopt(sv[1], SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof(filter));

    /* send a message */
    send(sv[0], message, strlen(message) + 1, 0);

    /* The filter should let the message pass but truncated. */
    poll(fds, 2, 0);

    /* Receive the truncated message*/
    ret = recv(sv[1], buffer, 64, 0);
    printf("received %d bytes, expected %d\n", ret, j);
  }

    for (i = 0 ; i < 2 ; i++)
      close(sv[i]);

  return 0;
}
Signed-off-by: NAlban Crequy <alban.crequy@collabora.co.uk>
Reviewed-by: NIan Molton <ian.molton@collabora.co.uk>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

d6ae3bae

D

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · a5db219f
由 David S. Miller 提交于 1月 18, 2011

a5db219f

gianfar: Fix misleading indentation in startup_gfar() · ff76015f

由 Anton Vorontsov 提交于 1月 18, 2011

Just stumbled upon the issue while looking for another bug.

The code looks correct, the indentation is not.
Signed-off-by: NAnton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

ff76015f

net/irda/sh_irda: return to RX mode when TX error · 5ae2f66f

由 Kuninori Morimoto 提交于 1月 13, 2011

sh_irda can not use RX/TX in same time,
but this driver didn't return to RX mode when TX error occurred.
This patch care xmit error case to solve this issue.
Signed-off-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

5ae2f66f

net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan. · 6ee400aa

由 Jesse Gross 提交于 1月 17, 2011

In netif_skb_features() we return only the features that are valid for vlans
if we have a vlan packet.  However, we should not mask out NETIF_F_HW_VLAN_TX
since it enables transmission of vlan tags and is obviously valid.
Reported-by: NEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: NJesse Gross <jesse@nicira.com>
Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

6ee400aa

USB CDC NCM: tx_fixup() race condition fix · f742aa8a

由 Alexey Orishko 提交于 1月 17, 2011

- tx_fixup() can be called from either timer callback or from xmit()
  in usbnet, so spinlock is added to avoid concurrency-related problem.
- minor correction due to checkpatch warning for some line over 80
  chars after previous patch was applied.
Signed-off-by: NAlexey Orishko <alexey.orishko@stericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

f742aa8a

ns83820: Avoid bad pointer deref in ns83820_init_one(). · 1956cc52

由 Jesper Juhl 提交于 1月 17, 2011

In drivers/net/ns83820.c::ns83820_init_one() we dynamically allocate
memory via alloc_etherdev(). We then call PRIV() on the returned storage
which is 'return netdev_priv()'. netdev_priv() takes the pointer it is
passed and adds 'ALIGN(sizeof(struct net_device), NETDEV_ALIGN)' to it and
returns it. Then we test the resulting pointer for NULL, which it is
unlikely to be at this point, and later dereference it. This will go bad
if alloc_etherdev() actually returned NULL.

This patch reworks the code slightly so that we test for a NULL pointer
(and return -ENOMEM) directly after calling alloc_etherdev().
Signed-off-by: NJesper Juhl <jj@chaosbits.net>
Signed-off-by: NBenjamin LaHaise <bcrl@kvack.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

1956cc52

ipv6: Silence privacy extensions initialization · 2fdc1c80

由 Romain Francoise 提交于 1月 17, 2011

When a network namespace is created (via CLONE_NEWNET), the loopback
interface is automatically added to the new namespace, triggering a
printk in ipv6_add_dev() if CONFIG_IPV6_PRIVACY is set.

This is problematic for applications which use CLONE_NEWNET as
part of a sandbox, like Chromium's suid sandbox or recent versions of
vsftpd. On a busy machine, it can lead to thousands of useless
"lo: Disabled Privacy Extensions" messages appearing in dmesg.

It's easy enough to check the status of privacy extensions via the
use_tempaddr sysctl, so just removing the printk seems like the most
sensible solution.
Signed-off-by: NRomain Francoise <romain@orebokech.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

2fdc1c80

bnx2x: Update bnx2x version to 1.62.00-4 · 6aefc522