1. 04 12月, 2009 10 次提交
  2. 04 11月, 2009 2 次提交
  3. 28 10月, 2009 1 次提交
  4. 23 10月, 2009 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 964fe080
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        move virtrng_remove to .devexit.text
        move virtballoon_remove to .devexit.text
        virtio_blk: Revert serial number support
        virtio: let header files include virtio_ids.h
        virtio_blk: revert QUEUE_FLAG_VIRT addition
      964fe080
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 4848490c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
        niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case
        KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST
        KS8851: Fix MAC address write order
        KS8851: Add soft reset at probe time
        net: fix section mismatch in fec.c
        net: Fix struct inet_timewait_sock bitfield annotation
        tcp: Try to catch MSG_PEEK bug
        net: Fix IP_MULTICAST_IF
        bluetooth: static lock key fix
        bluetooth: scheduling while atomic bug fix
        tcp: fix TCP_DEFER_ACCEPT retrans calculation
        tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPT
        tcp: accept socket after TCP_DEFER_ACCEPT period
        Revert "tcp: fix tcp_defer_accept to consider the timeout"
        AF_UNIX: Fix deadlock on connecting to shutdown socket
        ethoc: clear only pending irqs
        ethoc: inline regs access
        vmxnet3: use dev_dbg, fix build for CONFIG_BLOCK=n
        virtio_net: use dev_kfree_skb_any() in free_old_xmit_skbs()
        be2net: fix support for PCI hot plug
        ...
      4848490c
  5. 22 10月, 2009 16 次提交
  6. 21 10月, 2009 5 次提交
    • B
      KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST · b6a71bfa
      Ben Dooks 提交于
      In ks8851_set_rx_mode() the case handling IFF_MULTICAST was also setting
      the RXCR1_AE bit by accident. This meant that all unicast frames where
      being accepted by the device. Remove RXCR1_AE from this case.
      
      Note, RXCR1_AE was also masking a problem with setting the MAC address
      properly, so needs to be applied after fixing the MAC write order.
      
      Fixes a bug reported by Doong, Ping of Micrel. This version of the
      patch avoids setting RXCR1_ME for all cases.
      Signed-off-by: NBen Dooks <ben@simtec.co.uk>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b6a71bfa
    • B
      KS8851: Fix MAC address write order · 160d0fad
      Ben Dooks 提交于
      The MAC address register was being written in the wrong order, so add
      a new address macro to convert mac-address byte to register address and
      a ks8851_wrreg8() function to write each byte without having to worry
      about any difficult byte swapping.
      
      Fixes a bug reported by Doong, Ping of Micrel.
      Signed-off-by: NBen Dooks <ben@simtec.co.uk>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      160d0fad
    • B
      KS8851: Add soft reset at probe time · 57dada68
      Ben Dooks 提交于
      Issue a full soft reset at probe time.
      
      This was reported by Doong Ping of Micrel, but no explanation of why this
      is necessary or what bug it is fixing. Add it as it does not seem to hurt
      the current driver and ensures that the device is in a known state when we
      start setting it up.
      Signed-off-by: NBen Dooks <ben@simtec.co.uk>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      57dada68
    • S
      net: fix section mismatch in fec.c · 78abcb13
      Steven King 提交于
      fec_enet_init is called by both fec_probe and fec_resume, so it
      shouldn't be marked as __init.
      Signed-off-by: NSteven King <sfking@fdwdc.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      78abcb13
    • A
      dnotify: ignore FS_EVENT_ON_CHILD · 94552684
      Andreas Gruenbacher 提交于
      Mask off FS_EVENT_ON_CHILD in dnotify_handle_event().  Otherwise, when there
      is more than one watch on a directory and dnotify_should_send_event()
      succeeds, events with FS_EVENT_ON_CHILD set will trigger all watches and cause
      spurious events.
      
      This case was overlooked in commit e42e2773.
      
      	#define _GNU_SOURCE
      
      	#include <stdio.h>
      	#include <stdlib.h>
      	#include <unistd.h>
      	#include <signal.h>
      	#include <sys/types.h>
      	#include <sys/stat.h>
      	#include <fcntl.h>
      	#include <string.h>
      
      	static void create_event(int s, siginfo_t* si, void* p)
      	{
      		printf("create\n");
      	}
      
      	static void delete_event(int s, siginfo_t* si, void* p)
      	{
      		printf("delete\n");
      	}
      
      	int main (void) {
      		struct sigaction action;
      		char *tmpdir, *file;
      		int fd1, fd2;
      
      		sigemptyset (&action.sa_mask);
      		action.sa_flags = SA_SIGINFO;
      
      		action.sa_sigaction = create_event;
      		sigaction (SIGRTMIN + 0, &action, NULL);
      
      		action.sa_sigaction = delete_event;
      		sigaction (SIGRTMIN + 1, &action, NULL);
      
      	#	define TMPDIR "/tmp/test.XXXXXX"
      		tmpdir = malloc(strlen(TMPDIR) + 1);
      		strcpy(tmpdir, TMPDIR);
      		mkdtemp(tmpdir);
      
      	#	define TMPFILE "/file"
      		file = malloc(strlen(tmpdir) + strlen(TMPFILE) + 1);
      		sprintf(file, "%s/%s", tmpdir, TMPFILE);
      
      		fd1 = open (tmpdir, O_RDONLY);
      		fcntl(fd1, F_SETSIG, SIGRTMIN);
      		fcntl(fd1, F_NOTIFY, DN_MULTISHOT | DN_CREATE);
      
      		fd2 = open (tmpdir, O_RDONLY);
      		fcntl(fd2, F_SETSIG, SIGRTMIN + 1);
      		fcntl(fd2, F_NOTIFY, DN_MULTISHOT | DN_DELETE);
      
      		if (fork()) {
      			/* This triggers a create event */
      			creat(file, 0600);
      			/* This triggers a create and delete event (!) */
      			unlink(file);
      		} else {
      			sleep(1);
      			rmdir(tmpdir);
      		}
      
      		return 0;
      	}
      Signed-off-by: NAndreas Gruenbacher <agruen@suse.de>
      Signed-off-by: NEric Paris <eparis@redhat.com>
      94552684
  7. 20 10月, 2009 4 次提交