Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / fnic / fnic_fcs.c

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index d212eb5..999fc75 100644 (file)
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -664,7 +664,7 @@ static inline int fnic_import_rq_eth_pkt(struct fnic *fnic, struct sk_buff *skb)
        eh = (struct ethhdr *)skb->data;
        if (eh->h_proto == htons(ETH_P_8021Q)) {
                memmove((u8 *)eh + VLAN_HLEN, eh, ETH_ALEN * 2);
-               eh = (struct ethhdr *)skb_pull(skb, VLAN_HLEN);
+               eh = skb_pull(skb, VLAN_HLEN);
                skb_reset_mac_header(skb);
        }
        if (eh->h_proto == htons(ETH_P_FIP)) {
@@ -1024,8 +1024,7 @@ void fnic_eth_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
 
        if (!fnic->vlan_hw_insert) {
                eth_hdr = (struct ethhdr *)skb_mac_header(skb);
-               vlan_hdr = (struct vlan_ethhdr *)skb_push(skb,
-                               sizeof(*vlan_hdr) - sizeof(*eth_hdr));
+               vlan_hdr = skb_push(skb, sizeof(*vlan_hdr) - sizeof(*eth_hdr));
                memcpy(vlan_hdr, eth_hdr, 2 * ETH_ALEN);
                vlan_hdr->h_vlan_proto = htons(ETH_P_8021Q);
                vlan_hdr->h_vlan_encapsulated_proto = eth_hdr->h_proto;
@@ -1091,7 +1090,7 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
 
        if (!fnic->vlan_hw_insert) {
                eth_hdr_len = sizeof(*vlan_hdr) + sizeof(*fcoe_hdr);
-               vlan_hdr = (struct vlan_ethhdr *)skb_push(skb, eth_hdr_len);
+               vlan_hdr = skb_push(skb, eth_hdr_len);
                eth_hdr = (struct ethhdr *)vlan_hdr;
                vlan_hdr->h_vlan_proto = htons(ETH_P_8021Q);
                vlan_hdr->h_vlan_encapsulated_proto = htons(ETH_P_FCOE);
@@ -1099,7 +1098,7 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
                fcoe_hdr = (struct fcoe_hdr *)(vlan_hdr + 1);
        } else {
                eth_hdr_len = sizeof(*eth_hdr) + sizeof(*fcoe_hdr);
-               eth_hdr = (struct ethhdr *)skb_push(skb, eth_hdr_len);
+               eth_hdr = skb_push(skb, eth_hdr_len);
                eth_hdr->h_proto = htons(ETH_P_FCOE);
                fcoe_hdr = (struct fcoe_hdr *)(eth_hdr + 1);
        }