diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-08 17:19:01 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-08 17:19:01 -0800 |
commit | 263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea (patch) | |
tree | 5ee497d530185d32421122729af86cf77d0dc649 /drivers/net/ixgbe/ixgbe_fcoe.c | |
parent | net: Kill NETEVENT_PMTU_UPDATE. (diff) | |
parent | pch_can: fix module reload issue with MSI (diff) | |
download | linux-dev-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.tar.xz linux-dev-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_fcoe.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_fcoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c index 6342d4859790..8753980668c7 100644 --- a/drivers/net/ixgbe/ixgbe_fcoe.c +++ b/drivers/net/ixgbe/ixgbe_fcoe.c @@ -165,7 +165,7 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid, unsigned int thisoff = 0; unsigned int thislen = 0; u32 fcbuff, fcdmarw, fcfltrw; - dma_addr_t addr; + dma_addr_t addr = 0; if (!netdev || !sgl) return 0; |