diff options
author | 2011-04-19 00:21:33 -0700 | |
---|---|---|
committer | 2011-04-19 00:21:33 -0700 | |
commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /drivers/net/bna/bnad.c | |
parent | net: qlge: convert to hw_features (diff) | |
parent | ip6_pol_route panic: Do not allow VLAN on loopback (diff) | |
download | linux-dev-e1943424e43974f85b82bb31eaf832823bf49ce7.tar.xz linux-dev-e1943424e43974f85b82bb31eaf832823bf49ce7.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'drivers/net/bna/bnad.c')
-rw-r--r-- | drivers/net/bna/bnad.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c index b9f253470da2..e588511f47fb 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/bna/bnad.c @@ -1837,7 +1837,6 @@ bnad_setup_rx(struct bnad *bnad, uint rx_id) /* Initialize the Rx event handlers */ rx_cbfn.rcb_setup_cbfn = bnad_cb_rcb_setup; rx_cbfn.rcb_destroy_cbfn = bnad_cb_rcb_destroy; - rx_cbfn.rcb_destroy_cbfn = NULL; rx_cbfn.ccb_setup_cbfn = bnad_cb_ccb_setup; rx_cbfn.ccb_destroy_cbfn = bnad_cb_ccb_destroy; rx_cbfn.rx_cleanup_cbfn = bnad_cb_rx_cleanup; |