diff options
author | Chris Leech <christopher.leech@intel.com> | 2009-05-06 13:52:18 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-08 14:29:08 -0400 |
commit | 0f4915398a4233cdbfc4e9bf4436323546945b3f (patch) | |
tree | 6a13e4f1cbc7570906b740b2c3ffe228ea6368e3 /drivers/scsi/fcoe | |
parent | 5f48f70ecef25df93e122985272ff647f5653836 (diff) |
[SCSI] fcoe: use ETH_P_FIP for skb->protocol of FIP frames
FIP frames should leave the fcoe layer with skb->protocol set to
ETH_P_FIP, not ETH_P_802_3.
Signed-off-by: Chris Leech <christopher.leech@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r-- | drivers/scsi/fcoe/libfcoe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index a7ecafb9a507..929411880e4b 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c | |||
@@ -213,7 +213,7 @@ static void fcoe_ctlr_solicit(struct fcoe_ctlr *fip, struct fcoe_fcf *fcf) | |||
213 | sol->desc.size.fd_size = htons(fcoe_size); | 213 | sol->desc.size.fd_size = htons(fcoe_size); |
214 | 214 | ||
215 | skb_put(skb, sizeof(*sol)); | 215 | skb_put(skb, sizeof(*sol)); |
216 | skb->protocol = htons(ETH_P_802_3); | 216 | skb->protocol = htons(ETH_P_FIP); |
217 | skb_reset_mac_header(skb); | 217 | skb_reset_mac_header(skb); |
218 | skb_reset_network_header(skb); | 218 | skb_reset_network_header(skb); |
219 | fip->send(fip, skb); | 219 | fip->send(fip, skb); |
@@ -365,7 +365,7 @@ static void fcoe_ctlr_send_keep_alive(struct fcoe_ctlr *fip, int ports, u8 *sa) | |||
365 | } | 365 | } |
366 | 366 | ||
367 | skb_put(skb, len); | 367 | skb_put(skb, len); |
368 | skb->protocol = htons(ETH_P_802_3); | 368 | skb->protocol = htons(ETH_P_FIP); |
369 | skb_reset_mac_header(skb); | 369 | skb_reset_mac_header(skb); |
370 | skb_reset_network_header(skb); | 370 | skb_reset_network_header(skb); |
371 | fip->send(fip, skb); | 371 | fip->send(fip, skb); |
@@ -424,7 +424,7 @@ static int fcoe_ctlr_encaps(struct fcoe_ctlr *fip, | |||
424 | if (dtype != ELS_FLOGI) | 424 | if (dtype != ELS_FLOGI) |
425 | memcpy(mac->fd_mac, fip->data_src_addr, ETH_ALEN); | 425 | memcpy(mac->fd_mac, fip->data_src_addr, ETH_ALEN); |
426 | 426 | ||
427 | skb->protocol = htons(ETH_P_802_3); | 427 | skb->protocol = htons(ETH_P_FIP); |
428 | skb_reset_mac_header(skb); | 428 | skb_reset_mac_header(skb); |
429 | skb_reset_network_header(skb); | 429 | skb_reset_network_header(skb); |
430 | return 0; | 430 | return 0; |