PERFORCE change 128853 for review

Kip Macy kmacy at FreeBSD.org
Thu Nov 8 21:38:15 PST 2007


http://perforce.freebsd.org/chv.cgi?CH=128853

Change 128853 by kmacy at kmacy:storage:toestack on 2007/11/09 05:37:25

	fix handling of GET_IFF_MAC

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#16 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#16 (text+ko) ====

@@ -205,26 +205,29 @@
 static struct ifnet *
 get_iff_from_mac(adapter_t *adapter, const uint8_t *mac, unsigned int vlan)
 {
-#ifdef notyet	
 	int i;
 
 	for_each_port(adapter, i) {
+#ifdef notyet		
 		const struct vlan_group *grp;
+#endif		
 		const struct port_info *p = &adapter->port[i];
-		struct ifnet *ifnet = p->ifp;
+		struct ifnet *ifp = p->ifp;
 
 		if (!memcmp(p->hw_addr, mac, ETHER_ADDR_LEN)) {
+#ifdef notyet	
+			
 			if (vlan && vlan != EVL_VLID_MASK) {
 				grp = p->vlan_grp;
 				dev = grp ? grp->vlan_devices[vlan] : NULL;
 			} else
 				while (dev->master)
 					dev = dev->master;
-			return dev;
+#endif			
+			return (ifp);
 		}
 	}
-#endif	
-	return NULL;
+	return (NULL);
 }
 
 static inline void


More information about the p4-projects mailing list