diff options
Diffstat (limited to 'drivers/net/efi-snp.c')
| -rw-r--r-- | drivers/net/efi-snp.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/net/efi-snp.c b/drivers/net/efi-snp.c index 9cb7144187..476015f1c2 100644 --- a/drivers/net/efi-snp.c +++ b/drivers/net/efi-snp.c @@ -69,10 +69,10 @@ struct efi_simple_network_mode { uint32_t ReceiveFilterSetting; uint32_t MaxMCastFilterCount; uint32_t MCastFilterCount; - efi_mac_address MCastFilter[MAX_MCAST_FILTER_CNT]; - efi_mac_address CurrentAddress; - efi_mac_address BroadcastAddress; - efi_mac_address PermanentAddress; + struct efi_mac_address MCastFilter[MAX_MCAST_FILTER_CNT]; + struct efi_mac_address CurrentAddress; + struct efi_mac_address BroadcastAddress; + struct efi_mac_address PermanentAddress; uint8_t IfType; bool MacAddressChangeable; bool MultipleTxSupported; @@ -92,14 +92,14 @@ struct efi_simple_network { efi_status_t (EFIAPI *shutdown) (struct efi_simple_network *This); efi_status_t (EFIAPI *receive_filters) (struct efi_simple_network *This, uint32_t Enable, uint32_t Disable, bool ResetMCastFilter, - unsigned long MCastFilterCnt, efi_mac_address *MCastFilter); + unsigned long MCastFilterCnt, struct efi_mac_address *MCastFilter); efi_status_t (EFIAPI *station_address) (struct efi_simple_network *This, - bool Reset, efi_mac_address *New); + bool Reset, struct efi_mac_address *New); efi_status_t (EFIAPI *statistics) (struct efi_simple_network *This, bool Reset, unsigned long *StatisticsSize, struct efi_network_statistics *StatisticsTable); efi_status_t (EFIAPI *mcast_ip_to_mac) (struct efi_simple_network *This, - bool IPv6, efi_ip_address *IP, efi_mac_address *MAC); + bool IPv6, union efi_ip_address *IP, struct efi_mac_address *MAC); efi_status_t (EFIAPI *nvdata) (struct efi_simple_network *This, bool ReadWrite, unsigned long Offset, unsigned long BufferSize, void *Buffer); @@ -107,19 +107,20 @@ struct efi_simple_network { uint32_t *InterruptStatus, void **TxBuf); efi_status_t (EFIAPI *transmit) (struct efi_simple_network *This, unsigned long HeaderSize, unsigned long BufferSize, void *Buffer, - efi_mac_address *SrcAddr, efi_mac_address *DestAddr, + struct efi_mac_address *SrcAddr, struct efi_mac_address *DestAddr, uint16_t *Protocol); efi_status_t (EFIAPI *receive) (struct efi_simple_network *This, unsigned long *HeaderSize, unsigned long *BufferSize, void *Buffer, - efi_mac_address *SrcAddr, efi_mac_address *DestAddr, uint16_t *Protocol); + struct efi_mac_address *SrcAddr, struct efi_mac_address *DestAddr, uint16_t *Protocol); void *WaitForPacket; struct efi_simple_network_mode *Mode; }; struct efi_snp_priv { - struct device_d *dev; + struct device *dev; struct eth_device edev; struct efi_simple_network *snp; + void *rx_buf; }; static inline struct efi_snp_priv *to_priv(struct eth_device *edev) @@ -163,7 +164,7 @@ static int efi_snp_eth_rx(struct eth_device *edev) long bufsize = PKTSIZE; efi_status_t efiret; - efiret = priv->snp->receive(priv->snp, NULL, &bufsize, NetRxPackets[0], NULL, NULL, NULL); + efiret = priv->snp->receive(priv->snp, NULL, &bufsize, priv->rx_buf, NULL, NULL, NULL); if (efiret == EFI_NOT_READY) return 0; @@ -172,7 +173,7 @@ static int efi_snp_eth_rx(struct eth_device *edev) return -efi_errno(efiret); } - net_receive(edev, NetRxPackets[0], bufsize); + net_receive(edev, priv->rx_buf, bufsize); return 0; } @@ -219,7 +220,7 @@ static int efi_snp_eth_open(struct eth_device *edev) } efiret = priv->snp->station_address(priv->snp, false, - (efi_mac_address *)priv->snp->Mode->PermanentAddress.Addr ); + (struct efi_mac_address *)priv->snp->Mode->PermanentAddress.Addr ); if (EFI_ERROR(efiret)) { dev_err(priv->dev, "failed to set MAC address: %s\n", efi_strerror(efiret)); @@ -285,6 +286,7 @@ static int efi_snp_probe(struct efi_device *efidev) priv = xzalloc(sizeof(struct efi_snp_priv)); priv->snp = efidev->protocol; priv->dev = &efidev->dev; + priv->rx_buf = xmalloc(PKTSIZE); dev_dbg(&efidev->dev, "perm: %02x:%02x:%02x:%02x:%02x:%02x\n", priv->snp->Mode->PermanentAddress.Addr[0], |