File ipxe.1cbb1581f16e235fafc963c906ad02b38d5457bd.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.1cbb1581f16e235fafc963c906ad02b38d5457bd.patch of Package xen (Revision 1b049f727c9e7d4aec4eb434d870b455)

Currently displaying revision 1b049f727c9e7d4aec4eb434d870b455 , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Thu, 30 Aug 2012 15:58:58 +0100
Subject: 1cbb1581f16e235fafc963c906ad02b38d5457bd

[ethernet] Expose eth_broadcast as a global constant

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/include/ipxe/ethernet.h | 1 +
 src/net/80211/net80211.c    | 7 ++-----
 src/net/ethernet.c          | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

--- a/src/include/ipxe/ethernet.h
+++ b/src/include/ipxe/ethernet.h
@@ -68,20 +68,21 @@ static inline int is_broadcast_ether_addr ( const void *addr ) {
  *
  * @v addr		Ethernet address
  * @ret is_valid	Address is valid
  *
  * Check that the Ethernet address (MAC) is not 00:00:00:00:00:00, is
  * not a multicast address, and is not ff:ff:ff:ff:ff:ff.
  */
 static inline int is_valid_ether_addr ( const void *addr ) {
 	return ( ( ! is_multicast_ether_addr ( addr ) ) &&
 		 ( ! is_zero_ether_addr ( addr ) ) );
 }
 
+extern uint8_t eth_broadcast[];
 extern void eth_init_addr ( const void *hw_addr, void *ll_addr );
 extern const char * eth_ntoa ( const void *ll_addr );
 extern int eth_mc_hash ( unsigned int af, const void *net_addr,
 			 void *ll_addr );
 extern int eth_eth_addr ( const void *ll_addr, void *eth_addr );
 extern struct net_device * alloc_etherdev ( size_t priv_size );
 
 #endif /* _IPXE_ETHERNET_H */
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -377,27 +377,24 @@ static void net80211_netdev_irq ( struct net_device *netdev, int enable )
 /** Network device operations for a wrapped 802.11 device */
 static struct net_device_operations net80211_netdev_ops = {
 	.open = net80211_netdev_open,
 	.close = net80211_netdev_close,
 	.transmit = net80211_netdev_transmit,
 	.poll = net80211_netdev_poll,
 	.irq = net80211_netdev_irq,
 };
 
 
 /* ---------- 802.11 link-layer protocol ---------- */
 
-/** 802.11 broadcast MAC address */
-static u8 net80211_ll_broadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
 /**
  * Determine whether a transmission rate uses ERP/OFDM
  *
  * @v rate	Rate in 100 kbps units
  * @ret is_erp	TRUE if the rate is an ERP/OFDM rate
  *
  * 802.11b supports rates of 1.0, 2.0, 5.5, and 11.0 Mbps; any other
  * rate than these on the 2.4GHz spectrum is an ERP (802.11g) rate.
  */
 static inline int net80211_rate_is_erp ( u16 rate )
 {
 	if ( rate == 10 || rate == 20 || rate == 55 || rate == 110 )
@@ -753,25 +750,25 @@ static struct process_descriptor net80211_process_desc =
  * appropriately.
  */
 struct net80211_device * net80211_alloc ( size_t priv_size )
 {
 	struct net80211_device *dev;
 	struct net_device *netdev =
 		alloc_netdev ( sizeof ( *dev ) + priv_size );
 
 	if ( ! netdev )
 		return NULL;
 
 	netdev->ll_protocol = &net80211_ll_protocol;
-	netdev->ll_broadcast = net80211_ll_broadcast;
+	netdev->ll_broadcast = eth_broadcast;
 	netdev->max_pkt_len = IEEE80211_MAX_DATA_LEN;
 	netdev_init ( netdev, &net80211_netdev_ops );
 
 	dev = netdev->priv;
 	dev->netdev = netdev;
 	dev->priv = ( u8 * ) dev + sizeof ( *dev );
 	dev->op = &net80211_null_ops;
 
 	process_init_stopped ( &dev->proc_assoc, &net80211_process_desc,
 			       &netdev->refcnt );
 	INIT_LIST_HEAD ( &dev->mgmt_queue );
 	INIT_LIST_HEAD ( &dev->mgmt_info_queue );
@@ -1389,25 +1386,25 @@ int net80211_probe_step ( struct net80211_probe_ctx *ctx )
 
 		if ( ctx->probe ) {
 			struct io_buffer *siob = ctx->probe; /* to send */
 
 			/* make a copy for future use */
 			iob = alloc_iob ( siob->tail - siob->head );
 			iob_reserve ( iob, iob_headroom ( siob ) );
 			memcpy ( iob_put ( iob, iob_len ( siob ) ),
 				 siob->data, iob_len ( siob ) );
 
 			ctx->probe = iob;
 			rc = net80211_tx_mgmt ( dev, IEEE80211_STYPE_PROBE_REQ,
-						net80211_ll_broadcast,
+						eth_broadcast,
 						iob_disown ( siob ) );
 			if ( rc ) {
 				DBGC ( dev, "802.11 %p send probe failed: "
 				       "%s\n", dev, strerror ( rc ) );
 				return rc;
 			}
 		}
 	}
 
 	/* Check for new management packets */
 	while ( ( iob = net80211_mgmt_dequeue ( dev, &signal ) ) != NULL ) {
 		struct ieee80211_frame *hdr;
--- a/src/net/ethernet.c
+++ b/src/net/ethernet.c
@@ -29,25 +29,25 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/in.h>
 #include <ipxe/netdevice.h>
 #include <ipxe/iobuf.h>
 #include <ipxe/ethernet.h>
 
 /** @file
  *
  * Ethernet protocol
  *
  */
 
 /** Ethernet broadcast MAC address */
-static uint8_t eth_broadcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+uint8_t eth_broadcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 /**
  * Add Ethernet link-layer header
  *
  * @v netdev		Network device
  * @v iobuf		I/O buffer
  * @v ll_dest		Link-layer destination address
  * @v ll_source		Source link-layer address
  * @v net_proto		Network-layer protocol, in network-byte order
  * @ret rc		Return status code
  */
 static int eth_push ( struct net_device *netdev __unused,

Places

File ipxe.1cbb1581f16e235fafc963c906ad02b38d5457bd.patch of Package xen (Revision 1b049f727c9e7d4aec4eb434d870b455)

Places