diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-09-13 16:38:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-15 12:49:11 -0400 |
commit | 17b6f244483a6799e43f9af649a2eb94fa1502ec (patch) | |
tree | 9ff12fa9d0396fdeb1b8e5e1d2a6306c5ee1446f | |
parent | 61cd2ebb35dcf1990f66af76649260a79ae4cb15 (diff) |
bna: use container_of to resolve bufdesc_ex from bufdesc
Use container_of instead of casting first structure member.
Compiled but untested.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_enet.c | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c index 13f9636cdba7..903466ef41c0 100644 --- a/drivers/net/ethernet/brocade/bna/bna_enet.c +++ b/drivers/net/ethernet/brocade/bna/bna_enet.c | |||
@@ -107,7 +107,8 @@ bna_bfi_ethport_admin_rsp(struct bna_ethport *ethport, | |||
107 | { | 107 | { |
108 | struct bfi_enet_enable_req *admin_req = | 108 | struct bfi_enet_enable_req *admin_req = |
109 | ðport->bfi_enet_cmd.admin_req; | 109 | ðport->bfi_enet_cmd.admin_req; |
110 | struct bfi_enet_rsp *rsp = (struct bfi_enet_rsp *)msghdr; | 110 | struct bfi_enet_rsp *rsp = |
111 | container_of(msghdr, struct bfi_enet_rsp, mh); | ||
111 | 112 | ||
112 | switch (admin_req->enable) { | 113 | switch (admin_req->enable) { |
113 | case BNA_STATUS_T_ENABLED: | 114 | case BNA_STATUS_T_ENABLED: |
@@ -133,7 +134,8 @@ bna_bfi_ethport_lpbk_rsp(struct bna_ethport *ethport, | |||
133 | { | 134 | { |
134 | struct bfi_enet_diag_lb_req *diag_lb_req = | 135 | struct bfi_enet_diag_lb_req *diag_lb_req = |
135 | ðport->bfi_enet_cmd.lpbk_req; | 136 | ðport->bfi_enet_cmd.lpbk_req; |
136 | struct bfi_enet_rsp *rsp = (struct bfi_enet_rsp *)msghdr; | 137 | struct bfi_enet_rsp *rsp = |
138 | container_of(msghdr, struct bfi_enet_rsp, mh); | ||
137 | 139 | ||
138 | switch (diag_lb_req->enable) { | 140 | switch (diag_lb_req->enable) { |
139 | case BNA_STATUS_T_ENABLED: | 141 | case BNA_STATUS_T_ENABLED: |
@@ -161,7 +163,8 @@ static void | |||
161 | bna_bfi_attr_get_rsp(struct bna_ioceth *ioceth, | 163 | bna_bfi_attr_get_rsp(struct bna_ioceth *ioceth, |
162 | struct bfi_msgq_mhdr *msghdr) | 164 | struct bfi_msgq_mhdr *msghdr) |
163 | { | 165 | { |
164 | struct bfi_enet_attr_rsp *rsp = (struct bfi_enet_attr_rsp *)msghdr; | 166 | struct bfi_enet_attr_rsp *rsp = |
167 | container_of(msghdr, struct bfi_enet_attr_rsp, mh); | ||
165 | 168 | ||
166 | /** | 169 | /** |
167 | * Store only if not set earlier, since BNAD can override the HW | 170 | * Store only if not set earlier, since BNAD can override the HW |
diff --git a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c index 85e63546abe3..8ee3fdcc17cd 100644 --- a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c +++ b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c | |||
@@ -715,7 +715,7 @@ bna_bfi_rxf_ucast_set_rsp(struct bna_rxf *rxf, | |||
715 | struct bfi_msgq_mhdr *msghdr) | 715 | struct bfi_msgq_mhdr *msghdr) |
716 | { | 716 | { |
717 | struct bfi_enet_rsp *rsp = | 717 | struct bfi_enet_rsp *rsp = |
718 | (struct bfi_enet_rsp *)msghdr; | 718 | container_of(msghdr, struct bfi_enet_rsp, mh); |
719 | 719 | ||
720 | if (rsp->error) { | 720 | if (rsp->error) { |
721 | /* Clear ucast from cache */ | 721 | /* Clear ucast from cache */ |
@@ -732,7 +732,7 @@ bna_bfi_rxf_mcast_add_rsp(struct bna_rxf *rxf, | |||
732 | struct bfi_enet_mcast_add_req *req = | 732 | struct bfi_enet_mcast_add_req *req = |
733 | &rxf->bfi_enet_cmd.mcast_add_req; | 733 | &rxf->bfi_enet_cmd.mcast_add_req; |
734 | struct bfi_enet_mcast_add_rsp *rsp = | 734 | struct bfi_enet_mcast_add_rsp *rsp = |
735 | (struct bfi_enet_mcast_add_rsp *)msghdr; | 735 | container_of(msghdr, struct bfi_enet_mcast_add_rsp, mh); |
736 | 736 | ||
737 | bna_rxf_mchandle_attach(rxf, (u8 *)&req->mac_addr, | 737 | bna_rxf_mchandle_attach(rxf, (u8 *)&req->mac_addr, |
738 | ntohs(rsp->handle)); | 738 | ntohs(rsp->handle)); |