Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

1 files changed, 1 insertions, 1 deletions

diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 0c2826337919..116d3fd3d669 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -435,10 +435,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
                 udpdest.sin_addr.s_addr = htonl(network | addr.station);
         }
 
+        memset(&ah, 0, sizeof(ah));
         ah.port = port;
         ah.cb = cb & 0x7f;
         ah.code = 2;            /* magic */
-        ah.pad = 0;
 
         /* tack our header on the front of the iovec */
         size = sizeof(struct aunhdr);