Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

2 files changed, 2 insertions, 0 deletions

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 014f6ce48172..4dfdcbc6bf68 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -434,6 +434,7 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
          * reclaim all locks we hold on this server.
          */
         memset(&saddr, 0, sizeof(saddr));
+        saddr.sin_family = AF_INET;
         saddr.sin_addr.s_addr = argp->addr;
         nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state);
 
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 548b0bb2b84d..3ca89e2a9381 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -466,6 +466,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
          * reclaim all locks we hold on this server.
          */
         memset(&saddr, 0, sizeof(saddr));
+        saddr.sin_family = AF_INET;
         saddr.sin_addr.s_addr = argp->addr;
         nlm_host_rebooted(&saddr, argp->mon, argp->len, argp->state);