Skip to contentSkip to conversation

s390: qeth patches for net-next

PATCH In review [email protected] 2 participants 4 messages May 16, 2012

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover s390: qeth patches for net-next

Hi Dave,

here are 2 qeth patches for net-next

shortlog:

Ursula Braun (1)
qeth: recognize vlan devices in layer3 mode

Frank Blaschka (1)
qeth: remove token ring part 2

Thanks,
Frank

#1 lore raw

PATCH 1/2 qeth: remove token ring part 2

From: Frank Blaschka <[email protected]>

Commit 1abd2296b4a1ee7b6a883541c3ede52042a09521 starts removing token ring from qeth_l3. This patch removes the rest of token ring related code from the driver.

---
 drivers/s390/net/qeth_core.h      |    2 
 drivers/s390/net/qeth_core_main.c |    2 
 drivers/s390/net/qeth_core_mpc.h  |   10 ---
 drivers/s390/net/qeth_l3_main.c   |   55 ------------------
 drivers/s390/net/qeth_l3_sys.c    |  112 --------------------------------------
 5 files changed, 181 deletions(-)
drivers/s390/net/qeth_core.h +0 -2
@@ -674,8 +674,6 @@ struct qeth_card_options {
 	struct qeth_ipa_info adp; /*Adapter parameters*/
 	struct qeth_routing_info route6;
 	struct qeth_ipa_info ipa6;
-	int broadcast_mode;
-	int macaddr_mode;
 	int fake_broadcast;
 	int add_hhlen;
 	int layer2;
drivers/s390/net/qeth_core_main.c +0 -2
@@ -1329,8 +1329,6 @@ static void qeth_set_intial_options(stru
 {
 	card->options.route4.type = NO_ROUTER;
 	card->options.route6.type = NO_ROUTER;
-	card->options.broadcast_mode = QETH_TR_BROADCAST_ALLRINGS;
-	card->options.macaddr_mode = QETH_TR_MACADDR_NONCANONICAL;
 	card->options.fake_broadcast = 0;
 	card->options.add_hhlen = DEFAULT_ADD_HHLEN;
 	card->options.performance_stats = 0;
drivers/s390/net/qeth_core_mpc.h +0 -10
@@ -70,16 +70,6 @@ enum qeth_link_types {
 	QETH_LINK_TYPE_ATM_NATIVE   = 0x90,
 };
 
-enum qeth_tr_macaddr_modes {
-	QETH_TR_MACADDR_NONCANONICAL = 0,
-	QETH_TR_MACADDR_CANONICAL    = 1,
-};
-
-enum qeth_tr_broadcast_modes {
-	QETH_TR_BROADCAST_ALLRINGS = 0,
-	QETH_TR_BROADCAST_LOCAL    = 1,
-};
-
 /*
  * Routing stuff
  */
drivers/s390/net/qeth_l3_main.c +0 -55

67 lines not on this page · raw message

drivers/s390/net/qeth_l3_sys.c +0 -112

124 lines not on this page · raw message

#2 lore raw

PATCH 2/2 qeth: recognize vlan devices in layer3 mode

In reply to [email protected]

The qeth layer3 driver is notified about IP address changes. Changes concerning qeth driven network interfaces have to be forwarded to the OSA-card. This includes IP addresses of VLAN interfaces with a qeth device as base device. Function qeth_l3_verify_vlan_dev() determines if the net_device of the IP event belongs to a vlan device belonging to a qeth device as real device. This function is broken starting with commit 7ff0bcf676f7ed224ce21b58c7858c8e527068b2 , which means IP addresses of VLAN devices are no longer set at the base qeth device. The patch repairs function qeth_l3_verify_vlan_dev().

---
 drivers/s390/net/qeth_l3_main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/net/qeth_l3_main.c +2 -2
@@ -2073,7 +2073,7 @@ static int qeth_l3_verify_vlan_dev(struc
 		struct net_device *netdev;
 
 		rcu_read_lock();
-		netdev = __vlan_find_dev_deep(dev, vid);
+		netdev = __vlan_find_dev_deep(card->dev, vid);
 		rcu_read_unlock();
 		if (netdev == dev) {
 			rc = QETH_VLAN_CARD;
@@ -3602,9 +3602,9 @@ static int qeth_l3_ip_event(struct notif
 		return NOTIFY_DONE;
 
 	card = qeth_l3_get_card_from_dev(dev);
-	QETH_CARD_TEXT(card, 3, "ipevent");
 	if (!card)
 		return NOTIFY_DONE;
+	QETH_CARD_TEXT(card, 3, "ipevent");
 
 	addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
 	if (addr != NULL) {