The patch titled
uml: header_ops conversion needed for non-ethernet drivers
has been removed from the -mm tree. Its filename was
uml-header_ops-conversion-needed-for-non-ethernet-drivers.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: header_ops conversion needed for non-ethernet drivers
From: Jeff Dike <jdike@xxxxxxxxxxx>
UML's two non-ethernet drivers need some header_ops conversion.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/drivers/slip_kern.c | 4 +---
arch/um/drivers/slirp_kern.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff -puN arch/um/drivers/slip_kern.c~uml-header_ops-conversion-needed-for-non-ethernet-drivers arch/um/drivers/slip_kern.c
--- a/arch/um/drivers/slip_kern.c~uml-header_ops-conversion-needed-for-non-ethernet-drivers
+++ a/arch/um/drivers/slip_kern.c
@@ -30,10 +30,8 @@ void slip_init(struct net_device *dev, v
slip_proto_init(&spri->slip);
dev->init = NULL;
- dev->header_cache_update = NULL;
- dev->hard_header_cache = NULL;
- dev->hard_header = NULL;
dev->hard_header_len = 0;
+ dev->header_ops = NULL;
dev->addr_len = 0;
dev->type = ARPHRD_SLIP;
dev->tx_queue_len = 256;
diff -puN arch/um/drivers/slirp_kern.c~uml-header_ops-conversion-needed-for-non-ethernet-drivers arch/um/drivers/slirp_kern.c
--- a/arch/um/drivers/slirp_kern.c~uml-header_ops-conversion-needed-for-non-ethernet-drivers
+++ a/arch/um/drivers/slirp_kern.c
@@ -31,9 +31,7 @@ void slirp_init(struct net_device *dev,
dev->init = NULL;
dev->hard_header_len = 0;
- dev->header_cache_update = NULL;
- dev->hard_header_cache = NULL;
- dev->hard_header = NULL;
+ dev->header_ops = NULL;
dev->addr_len = 0;
dev->type = ARPHRD_SLIP;
dev->tx_queue_len = 256;
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
git-kvm.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
