patch-2.4.21 linux-2.4.21/drivers/net/fc/iph5526.c
Next file: linux-2.4.21/drivers/net/fc/iph5526_ip.h
Previous file: linux-2.4.21/drivers/net/ewrk3.c
Back to the patch index
Back to the overall index
- Lines: 48
- Date:
2003-06-13 07:51:34.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/fc/iph5526.c
- Orig date:
2002-08-02 17:39:44.000000000 -0700
diff -urN linux-2.4.20/drivers/net/fc/iph5526.c linux-2.4.21/drivers/net/fc/iph5526.c
@@ -3174,38 +3174,6 @@
LEAVE("rx_net_mfs_packet");
}
-unsigned short fc_type_trans(struct sk_buff *skb, struct net_device *dev)
-{
-struct fch_hdr *fch=(struct fch_hdr *)skb->data;
-struct fcllc *fcllc;
- skb->mac.raw = skb->data;
- fcllc = (struct fcllc *)(skb->data + sizeof(struct fch_hdr) + 2);
- skb_pull(skb,sizeof(struct fch_hdr) + 2);
-
- if(*fch->daddr & 1) {
- if(!memcmp(fch->daddr,dev->broadcast,FC_ALEN))
- skb->pkt_type = PACKET_BROADCAST;
- else
- skb->pkt_type = PACKET_MULTICAST;
- }
- else if(dev->flags & IFF_PROMISC) {
- if(memcmp(fch->daddr, dev->dev_addr, FC_ALEN))
- skb->pkt_type=PACKET_OTHERHOST;
- }
-
- /* Strip the SNAP header from ARP packets since we don't
- * pass them through to the 802.2/SNAP layers.
- */
-
- if (fcllc->dsap == EXTENDED_SAP &&
- (fcllc->ethertype == ntohs(ETH_P_IP) ||
- fcllc->ethertype == ntohs(ETH_P_ARP))) {
- skb_pull(skb, sizeof(struct fcllc));
- return fcllc->ethertype;
- }
- return ntohs(ETH_P_802_2);
-}
-
static int tx_exchange(struct fc_info *fi, char *data, u_int len, u_int r_ctl, u_int type, u_int d_id, u_int mtu, int int_required, u_short tx_ox_id, u_int frame_class)
{
u_char df_ctl;
@@ -3768,7 +3736,7 @@
for (i = 0; i <= MAX_FC_CARDS; i++)
fc[i] = NULL;
- for (i = 0; i < clone_list[i].vendor_id != 0; i++)
+ for (i = 0; clone_list[i].vendor_id != 0; i++)
while ((pdev = pci_find_device(clone_list[i].vendor_id, clone_list[i].device_id, pdev))) {
unsigned short pci_command;
if (pci_enable_device(pdev))
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)