Message ID | 20111025121551.GA2108@marke.airties |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Tue, Oct 25, 2011 at 01:15:52PM +0100, Mark Einon wrote: > > Manually merged changes from commits afc4b13df143, bf3f1a6081aa and 5d6bcdfe38ce into et131x.c as identified in email below. > > Also removed dependency on NETDEV_1000 in Kconfig, which no longer exists. > > Greg: This patch should also be good for the staging tree. I don't think this is needed anymore, right? If so, please redo it against Linus's tree and send it to me. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 31 January 2012 18:26, Greg KH <greg@kroah.com> wrote: > On Tue, Oct 25, 2011 at 01:15:52PM +0100, Mark Einon wrote: >> >> Manually merged changes from commits afc4b13df143, bf3f1a6081aa and 5d6bcdfe38ce into et131x.c as identified in email below. >> >> Also removed dependency on NETDEV_1000 in Kconfig, which no longer exists. >> >> Greg: This patch should also be good for the staging tree. > > I don't think this is needed anymore, right? Hi Greg, Correct, this change is in staging-next and does not need to be applied. It's since been added by a merge from Linus's tree. Cheers, Mark > > If so, please redo it against Linus's tree and send it to me. > > thanks, > > greg k-h -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/et131x/Kconfig b/drivers/staging/et131x/Kconfig index f0ed08d..9e1864c 100644 --- a/drivers/staging/et131x/Kconfig +++ b/drivers/staging/et131x/Kconfig @@ -1,6 +1,6 @@ config ET131X tristate "Agere ET-1310 Gigabit Ethernet support" - depends on NETDEV_1000 && PCI + depends on PCI default n ---help--- This driver supports Agere ET-1310 ethernet adapters. diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 45b88d4..32c805b 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -3403,12 +3403,12 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) * returned by dma_map_page() is always 32-bit * addressable (as defined by the pci/dma subsystem) */ - desc[frag++].addr_lo = - dma_map_page(&adapter->pdev->dev, - frags[i - 1].page, - frags[i - 1].page_offset, - frags[i - 1].size, - DMA_TO_DEVICE); + desc[frag++].addr_lo = skb_frag_dma_map( + &adapter->pdev->dev, + &frags[i - 1], + 0, + frags[i - 1].size, + DMA_TO_DEVICE); } } @@ -5233,7 +5233,7 @@ static const struct net_device_ops et131x_netdev_ops = { .ndo_open = et131x_open, .ndo_stop = et131x_close, .ndo_start_xmit = et131x_tx, - .ndo_set_multicast_list = et131x_multicast, + .ndo_set_rx_mode = et131x_multicast, .ndo_tx_timeout = et131x_tx_timeout, .ndo_change_mtu = et131x_change_mtu, .ndo_set_mac_address = et131x_set_mac_addr,