[email protected] wrote:
> The patch titled
> git-netdev-all: e1000 fix
> has been added to the -mm tree. Its filename is
> git-netdev-all-e1000-fix.patch
>
> See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
> out what to do about this
>
> ------------------------------------------------------
> Subject: git-netdev-all: e1000 fix
> From: Andrew Morton <[email protected]>
>
> drivers/net/e1000/e1000_main.c:997:1: error: unterminated #ifdef
>
> Cc: Jeff Garzik <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> ---
>
> drivers/net/e1000/e1000_main.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff -puN drivers/net/e1000/e1000_main.c~git-netdev-all-e1000-fix drivers/net/e1000/e1000_main.c
> --- a/drivers/net/e1000/e1000_main.c~git-netdev-all-e1000-fix
> +++ a/drivers/net/e1000/e1000_main.c
> @@ -994,7 +994,6 @@ e1000_probe(struct pci_dev *pdev,
> (adapter->hw.mac_type != e1000_82547))
> netdev->features |= NETIF_F_TSO;
>
> -#ifdef NETIF_F_TSO6
> if (adapter->hw.mac_type > e1000_82547_rev_2)
> netdev->features |= NETIF_F_TSO6;
> if (pci_using_dac)
> _
doh, I wish I had not included that in my updated patch for -mm right now... I knew I
should have posted this to Jeff first when I spotted it myself this morning ;)
Ack, of course.
Cheers,
Auke