/*
*
- * linux/drivers/s390/net/qeth_main.c ($Revision: 1.170 $)
+ * linux/drivers/s390/net/qeth_main.c ($Revision: 1.145 $)
*
* Linux on zSeries OSA Express and HiperSockets support
*
* Frank Pavlic (pavlic@de.ibm.com) and
* Thomas Spatzier <tspat@de.ibm.com>
*
- * $Revision: 1.170 $ $Date: 2004/11/17 09:54:06 $
+ * $Revision: 1.145 $ $Date: 2004/10/08 15:08:40 $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
/***
* eye catcher; just for debugging purposes
*/
#include "qeth_mpc.h"
#include "qeth_fs.h"
-#define VERSION_QETH_C "$Revision: 1.170 $"
+#define VERSION_QETH_C "$Revision: 1.145 $"
static const char *version = "qeth S/390 OSA-Express driver";
/**
{
struct qeth_notify_list_struct *n_entry;
-
+ QETH_DBF_TEXT(trace, 2, "notreg");
/*check first if entry already exists*/
spin_lock(&qeth_notify_lock);
list_for_each_entry(n_entry, &qeth_notify_list, list) {
free_netdev(card->dev);
qeth_clear_ip_list(card, 0, 0);
qeth_clear_ipato_list(card);
- kfree(card->ip_tbd_list);
qeth_free_qdio_buffers(card);
kfree(card);
}
return;
} else
INIT_LIST_HEAD(card->ip_tbd_list);
-
+
while (!list_empty(tbd_list)){
todo = list_entry(tbd_list->next, struct qeth_ipaddr, entry);
list_del(&todo->entry);
card->options.fake_broadcast = 0;
card->options.add_hhlen = DEFAULT_ADD_HHLEN;
card->options.fake_ll = 0;
- card->options.layer2 = 0;
}
/**
card->info.if_name,
card->info.chpid);
card->lan_online = 0;
- netif_carrier_off(card->dev);
+ if (netif_carrier_ok(card->dev)) {
+ netif_carrier_off(card->dev);
+ netif_stop_queue(card->dev);
+ }
return NULL;
case IPA_CMD_STARTLAN:
PRINT_INFO("Link reestablished on %s "
card->info.if_name,
card->info.chpid);
card->lan_online = 1;
- netif_carrier_on(card->dev);
+ if (!netif_carrier_ok(card->dev)) {
+ netif_carrier_on(card->dev);
+ netif_wake_queue(card->dev);
+ }
qeth_reset_ip_addresses(card);
return NULL;
case IPA_CMD_REGISTER_LOCAL_ADDR:
void *reply_param)
{
int rc;
- char prot_type;
QETH_DBF_TEXT(trace,4,"sendipa");
memcpy(iob->data, IPA_PDU_HEADER, IPA_PDU_HEADER_SIZE);
-
- if (card->options.layer2)
- prot_type = QETH_PROT_LAYER2;
- else
- prot_type = QETH_PROT_TCPIP;
-
- memcpy(QETH_IPA_CMD_PROT_TYPE(iob->data),&prot_type,1);
memcpy(QETH_IPA_CMD_DEST_ADDR(iob->data),
&card->token.ulp_connection_r, QETH_MPC_TOKEN_LENGTH);
qeth_ulp_enable(struct qeth_card *card)
{
int rc;
- char prot_type;
struct qeth_cmd_buffer *iob;
/*FIXME: trace view callbacks*/
*(QETH_ULP_ENABLE_LINKNUM(iob->data)) =
(__u8) card->info.portno;
- if (card->options.layer2)
- prot_type = QETH_PROT_LAYER2;
- else
- prot_type = QETH_PROT_TCPIP;
- memcpy(QETH_ULP_ENABLE_PROT_TYPE(iob->data),&prot_type,1);
memcpy(QETH_ULP_ENABLE_DEST_ADDR(iob->data),
&card->token.cm_connection_r, QETH_MPC_TOKEN_LENGTH);
memcpy(QETH_ULP_ENABLE_FILTER_TOKEN(iob->data),
*hdr = element->addr + offset;
offset += sizeof(struct qeth_hdr);
- if (card->options.layer2)
- skb_len = (*hdr)->hdr.l2.pkt_length;
- else
- skb_len = (*hdr)->hdr.l3.length;
-
+ skb_len = (*hdr)->length;
if (!skb_len)
return NULL;
if (card->options.fake_ll){
static inline unsigned short
qeth_type_trans(struct sk_buff *skb, struct net_device *dev)
{
- struct qeth_card *card;
struct ethhdr *eth;
+ struct qeth_card *card;
- QETH_DBF_TEXT(trace,6,"typtrans");
+ QETH_DBF_TEXT(trace,5,"typtrans");
card = (struct qeth_card *)dev->priv;
#ifdef CONFIG_TR
(card->info.link_type == QETH_LINK_TYPE_LANE_TR))
return tr_type_trans(skb,dev);
#endif /* CONFIG_TR */
+
skb->mac.raw = skb->data;
- skb_pull(skb, ETH_HLEN );
+ skb_pull(skb, ETH_ALEN * 2 + sizeof (short));
eth = eth_hdr(skb);
if (*eth->h_dest & 1) {
skb->pkt_type = PACKET_BROADCAST;
else
skb->pkt_type = PACKET_MULTICAST;
- } else if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN))
+ } else {
skb->pkt_type = PACKET_OTHERHOST;
-
+ }
if (ntohs(eth->h_proto) >= 1536)
return eth->h_proto;
if (*(unsigned short *) (skb->data) == 0xFFFF)
memcpy(fake_hdr->h_dest, card->dev->dev_addr, ETH_ALEN);
}
/* the source MAC address */
- if (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
- memcpy(fake_hdr->h_source, &hdr->hdr.l3.dest_addr[2], ETH_ALEN);
+ if (hdr->ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
+ memcpy(fake_hdr->h_source, &hdr->dest_addr[2], ETH_ALEN);
else
memset(fake_hdr->h_source, 0, ETH_ALEN);
/* the protocol */
#ifdef CONFIG_QETH_VLAN
u16 *vlan_tag;
- if (hdr->hdr.l3.ext_flags &
- (QETH_HDR_EXT_VLAN_FRAME | QETH_HDR_EXT_INCLUDE_VLAN_TAG)) {
+ if (hdr->ext_flags & QETH_HDR_EXT_VLAN_FRAME) {
vlan_tag = (u16 *) skb_push(skb, VLAN_HLEN);
- *vlan_tag = (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_VLAN_FRAME)?
- hdr->hdr.l3.vlan_id : *((u16 *)&hdr->hdr.l3.dest_addr[12]);
+ *vlan_tag = hdr->vlan_id;
*(vlan_tag + 1) = skb->protocol;
skb->protocol = __constant_htons(ETH_P_8021Q);
}
#endif /* CONFIG_QETH_VLAN */
}
-static inline __u16
-qeth_layer2_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
- struct qeth_hdr *hdr)
-{
- unsigned short vlan_id = 0;
-
- skb->pkt_type = PACKET_HOST;
- if (card->options.checksum_type == NO_CHECKSUMMING)
- skb->ip_summed = CHECKSUM_UNNECESSARY;
- else
- skb->ip_summed = CHECKSUM_NONE;
-#ifdef CONFIG_QETH_VLAN
- if (hdr->hdr.l2.flags[2] & (QETH_LAYER2_FLAG_VLAN)) {
- skb_pull(skb, VLAN_HLEN);
- vlan_id = hdr->hdr.l2.vlan_id;
- }
-#endif
- skb->protocol = qeth_type_trans(skb, skb->dev);
- return vlan_id;
-}
-
static inline void
qeth_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
struct qeth_hdr *hdr)
{
#ifdef CONFIG_QETH_IPV6
- if (hdr->hdr.l3.flags & QETH_HDR_PASSTHRU) {
- skb->pkt_type = PACKET_HOST;
+ if (hdr->flags & QETH_HDR_PASSTHRU){
skb->protocol = qeth_type_trans(skb, card->dev);
return;
}
#endif /* CONFIG_QETH_IPV6 */
- skb->protocol = htons((hdr->hdr.l3.flags & QETH_HDR_IPV6)? ETH_P_IPV6 :
+ skb->protocol = htons((hdr->flags & QETH_HDR_IPV6)? ETH_P_IPV6 :
ETH_P_IP);
- switch (hdr->hdr.l3.flags & QETH_HDR_CAST_MASK){
+ switch (hdr->flags & QETH_HDR_CAST_MASK){
case QETH_CAST_UNICAST:
skb->pkt_type = PACKET_HOST;
break;
skb->mac.raw = skb->data;
skb->ip_summed = card->options.checksum_type;
if (card->options.checksum_type == HW_CHECKSUMMING){
- if ( (hdr->hdr.l3.ext_flags &
+ if ( (hdr->ext_flags &
(QETH_HDR_EXT_CSUM_HDR_REQ |
QETH_HDR_EXT_CSUM_TRANSP_REQ)) ==
(QETH_HDR_EXT_CSUM_HDR_REQ |
struct qeth_qdio_buffer *buf, int index)
{
struct qdio_buffer_element *element;
+ int offset;
struct sk_buff *skb;
struct qeth_hdr *hdr;
- int offset;
int rxrc;
- __u16 vlan_tag = 0;
/* get first element of current buffer */
element = (struct qdio_buffer_element *)&buf->buffer->element[0];
card->perf_stats.bufs_rec++;
#endif
while((skb = qeth_get_next_skb(card, buf->buffer, &element,
- &offset, &hdr))) {
- skb->dev = card->dev;
- if (hdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2)
- vlan_tag = qeth_layer2_rebuild_skb(card, skb, hdr);
- else
- qeth_rebuild_skb(card, skb, hdr);
+ &offset, &hdr))){
+ qeth_rebuild_skb(card, skb, hdr);
/* is device UP ? */
if (!(card->dev->flags & IFF_UP)){
dev_kfree_skb_any(skb);
continue;
}
-#ifdef CONFIG_QETH_VLAN
- if (vlan_tag)
- vlan_hwaccel_rx(skb, card->vlangrp, vlan_tag);
- else
-#endif
+ skb->dev = card->dev;
rxrc = netif_rx(skb);
card->dev->last_rx = jiffies;
card->stats.rx_packets++;
}
atomic_sub(count, &queue->used_buffers);
/* check if we need to do something on this outbound queue */
- if (card->info.type != QETH_CARD_TYPE_IQD)
- qeth_check_outbound_queue(queue);
+ qeth_check_outbound_queue(queue);
netif_wake_queue(card->dev);
#ifdef CONFIG_QETH_PERF_STATS
if (skb==NULL) {
card->stats.tx_dropped++;
card->stats.tx_errors++;
- /* return OK; otherwise ksoftirqd goes to 100% */
- return NETDEV_TX_OK;
+ return -EIO;
}
- if ((card->state != CARD_STATE_UP) || !card->lan_online) {
+ if ((card->state != CARD_STATE_UP) || !netif_carrier_ok(dev)) {
card->stats.tx_dropped++;
card->stats.tx_errors++;
card->stats.tx_carrier_errors++;
- dev_kfree_skb_any(skb);
- /* return OK; otherwise ksoftirqd goes to 100% */
- return NETDEV_TX_OK;
+ return -EIO;
}
#ifdef CONFIG_QETH_PERF_STATS
card->perf_stats.outbound_cnt++;
* got our own synchronization on queues we can keep the stack's
* queue running.
*/
- if ((rc = qeth_send_packet(card, skb))){
- if (rc == -EBUSY) {
- netif_stop_queue(dev);
- rc = NETDEV_TX_BUSY;
- } else {
- card->stats.tx_errors++;
- card->stats.tx_dropped++;
- dev_kfree_skb_any(skb);
- /* set to OK; otherwise ksoftirqd goes to 100% */
- rc = NETDEV_TX_OK;
- }
- }
+ if ((rc = qeth_send_packet(card, skb)))
+ netif_stop_queue(dev);
#ifdef CONFIG_QETH_PERF_STATS
card->perf_stats.outbound_time += qeth_get_micros() -
if (card->state != CARD_STATE_SOFTSETUP)
return -ENODEV;
- if ( (card->options.layer2) &&
- (!card->info.layer2_mac_registered)) {
- QETH_DBF_TEXT(trace,4,"nomacadr");
- return -EPERM;
- }
card->dev->flags |= IFF_UP;
netif_start_queue(dev);
card->data.state = CH_STATE_UP;
if (!card->lan_online){
if (netif_carrier_ok(dev))
netif_carrier_off(dev);
+ netif_stop_queue(dev);
}
return 0;
}
else if (skb->protocol == ETH_P_IP)
return ((skb->nh.raw[16] & 0xf0) == 0xe0) ? RTN_MULTICAST : 0;
/* ... */
- if (!memcmp(skb->data, skb->dev->broadcast, 6))
+ if (!memcmp(skb->nh.raw, skb->dev->broadcast, 6))
return RTN_BROADCAST;
else {
u16 hdr_mac;
- hdr_mac = *((u16 *)skb->data);
+ hdr_mac = *((u16 *)skb->nh.raw);
/* tr multicast? */
switch (card->info.link_type) {
case QETH_LINK_TYPE_HSTR:
*skb = new_skb;
}
#ifdef CONFIG_QETH_VLAN
- if (card->vlangrp && vlan_tx_tag_present(*skb) &&
- ((ipv == 6) || card->options.layer2) ) {
+ if (card->vlangrp && vlan_tx_tag_present(*skb) && (ipv == 6)){
/*
* Move the mac addresses (6 bytes src, 6 bytes dest)
* to the beginning of the new header. We are using three
memcpy((*skb)->data, (*skb)->data + 4, 4);
memcpy((*skb)->data + 4, (*skb)->data + 8, 4);
memcpy((*skb)->data + 8, (*skb)->data + 12, 4);
- tag = (u16 *)((*skb)->data + 12);
+ tag = (u16 *) (*skb)->data + 12;
/*
* first two bytes = ETH_P_8021Q (0x8100)
* second two bytes = VLANID
*/
*tag = __constant_htons(ETH_P_8021Q);
- *(tag + 1) = htons(vlan_tx_tag_get(*skb));
+ *(tag + 1) = vlan_tx_tag_get(*skb);
+ *(tag + 1) = htons(*(tag + 1));
}
#endif
*hdr = (struct qeth_hdr *) skb_push(*skb, sizeof(struct qeth_hdr));
return ct | QETH_CAST_UNICAST;
}
-static inline void
-qeth_layer2_get_packet_type(struct qeth_card *card, struct qeth_hdr *hdr,
- struct sk_buff *skb)
-{
- __u16 hdr_mac;
-
- if (!memcmp(skb->data+QETH_HEADER_SIZE,
- skb->dev->broadcast,6)) { /* broadcast? */
- *(__u32 *)hdr->hdr.l2.flags |=
- QETH_LAYER2_FLAG_BROADCAST << 8;
- return;
- }
- hdr_mac=*((__u16*)skb->data);
- /* tr multicast? */
- switch (card->info.link_type) {
- case QETH_LINK_TYPE_HSTR:
- case QETH_LINK_TYPE_LANE_TR:
- if ((hdr_mac == QETH_TR_MAC_NC) ||
- (hdr_mac == QETH_TR_MAC_C) )
- *(__u32 *)hdr->hdr.l2.flags |=
- QETH_LAYER2_FLAG_MULTICAST << 8;
- else
- *(__u32 *)hdr->hdr.l2.flags |=
- QETH_LAYER2_FLAG_UNICAST << 8;
- break;
- /* eth or so multicast? */
- default:
- if ( (hdr_mac==QETH_ETH_MAC_V4) ||
- (hdr_mac==QETH_ETH_MAC_V6) )
- *(__u32 *)hdr->hdr.l2.flags |=
- QETH_LAYER2_FLAG_MULTICAST << 8;
- else
- *(__u32 *)hdr->hdr.l2.flags |=
- QETH_LAYER2_FLAG_UNICAST << 8;
- }
-}
-
-static inline void
-qeth_layer2_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
- struct sk_buff *skb, int cast_type)
-{
- memset(hdr, 0, sizeof(struct qeth_hdr));
- hdr->hdr.l2.id = QETH_HEADER_TYPE_LAYER2;
-
- /* set byte 0 to "0x02" and byte 3 to casting flags */
- if (cast_type==RTN_MULTICAST)
- *(__u32 *)hdr->hdr.l2.flags |= QETH_LAYER2_FLAG_MULTICAST << 8;
- else if (cast_type==RTN_BROADCAST)
- *(__u32 *)hdr->hdr.l2.flags |= QETH_LAYER2_FLAG_BROADCAST << 8;
- else
- qeth_layer2_get_packet_type(card, hdr, skb);
-
- hdr->hdr.l2.pkt_length = skb->len-QETH_HEADER_SIZE;
-#ifdef CONFIG_QETH_VLAN
- /* VSWITCH relies on the VLAN
- * information to be present in
- * the QDIO header */
- if ((card->vlangrp != NULL) &&
- vlan_tx_tag_present(skb)) {
- *(__u32 *)hdr->hdr.l2.flags |= QETH_LAYER2_FLAG_VLAN << 8;
- hdr->hdr.l2.vlan_id = vlan_tx_tag_get(skb);
- }
-#endif
-}
-
static inline void
qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr,
struct sk_buff *skb, int ipv, int cast_type)
{
- QETH_DBF_TEXT(trace, 6, "fillhdr");
+ hdr->id = 1;
+ hdr->ext_flags = 0;
- if (card->options.layer2) {
- qeth_layer2_fill_header(card, hdr, skb, cast_type);
- return;
- }
- hdr->hdr.l3.id = QETH_HEADER_TYPE_LAYER3;
- hdr->hdr.l3.ext_flags = 0;
+ QETH_DBF_TEXT(trace, 6, "fillhdr");
#ifdef CONFIG_QETH_VLAN
/*
* before we're going to overwrite this location with next hop ip.
* v6 uses passthrough, v4 sets the tag in the QDIO header.
*/
if (card->vlangrp && vlan_tx_tag_present(skb)) {
- hdr->hdr.l3.ext_flags = (ipv == 4) ?
- QETH_HDR_EXT_VLAN_FRAME :
- QETH_HDR_EXT_INCLUDE_VLAN_TAG;
- hdr->hdr.l3.vlan_id = vlan_tx_tag_get(skb);
+ hdr->ext_flags = (ipv == 4)? QETH_EXT_HDR_VLAN_FRAME :
+ QETH_EXT_HDR_INCLUDE_VLAN_TAG;
+ hdr->vlan_id = vlan_tx_tag_get(skb);
}
#endif /* CONFIG_QETH_VLAN */
- hdr->hdr.l3.length = skb->len - sizeof(struct qeth_hdr);
+ hdr->length = skb->len - sizeof(struct qeth_hdr);
if (ipv == 4) { /* IPv4 */
- hdr->hdr.l3.flags = qeth_get_qeth_hdr_flags4(cast_type);
- memset(hdr->hdr.l3.dest_addr, 0, 12);
+ hdr->flags = qeth_get_qeth_hdr_flags4(cast_type);
+ memset(hdr->dest_addr, 0, 12);
if ((skb->dst) && (skb->dst->neighbour)) {
- *((u32 *) (&hdr->hdr.l3.dest_addr[12])) =
+ *((u32 *) (&hdr->dest_addr[12])) =
*((u32 *) skb->dst->neighbour->primary_key);
} else {
/* fill in destination address used in ip header */
- *((u32 *) (&hdr->hdr.l3.dest_addr[12])) = skb->nh.iph->daddr;
+ *((u32 *) (&hdr->dest_addr[12])) = skb->nh.iph->daddr;
}
} else if (ipv == 6) { /* IPv6 or passthru */
- hdr->hdr.l3.flags = qeth_get_qeth_hdr_flags6(cast_type);
+ hdr->flags = qeth_get_qeth_hdr_flags6(cast_type);
if ((skb->dst) && (skb->dst->neighbour)) {
- memcpy(hdr->hdr.l3.dest_addr,
+ memcpy(hdr->dest_addr,
skb->dst->neighbour->primary_key, 16);
} else {
/* fill in destination address used in ip header */
- memcpy(hdr->hdr.l3.dest_addr, &skb->nh.ipv6h->daddr, 16);
+ memcpy(hdr->dest_addr, &skb->nh.ipv6h->daddr, 16);
}
} else { /* passthrough */
if (!memcmp(skb->data + sizeof(struct qeth_hdr),
skb->dev->broadcast, 6)) { /* broadcast? */
- hdr->hdr.l3.flags = QETH_CAST_BROADCAST | QETH_HDR_PASSTHRU;
+ hdr->flags = QETH_CAST_BROADCAST | QETH_HDR_PASSTHRU;
} else {
- hdr->hdr.l3.flags = (cast_type == RTN_MULTICAST) ?
+ hdr->flags = (cast_type == RTN_MULTICAST) ?
QETH_CAST_MULTICAST | QETH_HDR_PASSTHRU :
QETH_CAST_UNICAST | QETH_HDR_PASSTHRU;
}
static inline int
qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
{
- int ipv = 0;
+ int ipv;
int cast_type;
struct qeth_qdio_out_q *queue;
struct qeth_hdr *hdr;
QETH_DBF_TEXT(trace, 6, "sendpkt");
- if (!card->options.layer2)
- ipv = qeth_get_ip_version(skb);
+ ipv = qeth_get_ip_version(skb);
cast_type = qeth_get_cast_type(card, skb);
if ((cast_type == RTN_BROADCAST) && (card->info.broadcast_capable == 0)){
card->stats.tx_dropped++;
* funcs flags); since all zeros is no valueable information,
* we say EOPNOTSUPP for all ARP functions
*/
- /*if (card->info.guestlan)
- return -EOPNOTSUPP; */
+ if (card->info.guestlan)
+ return -EOPNOTSUPP;
if (!qeth_is_supported(card,/*IPA_QUERY_ARP_ADDR_INFO*/
IPA_ARP_PROCESSING)) {
PRINT_WARN("ARP processing not supported "
switch (cmd){
case SIOC_QETH_ARP_SET_NO_ENTRIES:
- if ( !capable(CAP_NET_ADMIN) ||
- (card->options.layer2) ) {
+ if (!capable(CAP_NET_ADMIN)){
rc = -EPERM;
break;
}
rc = qeth_arp_set_no_entries(card, rq->ifr_ifru.ifru_ivalue);
break;
case SIOC_QETH_ARP_QUERY_INFO:
- if ( !capable(CAP_NET_ADMIN) ||
- (card->options.layer2) ) {
+ if (!capable(CAP_NET_ADMIN)){
rc = -EPERM;
break;
}
rc = qeth_arp_query(card, rq->ifr_ifru.ifru_data);
break;
case SIOC_QETH_ARP_ADD_ENTRY:
- if ( !capable(CAP_NET_ADMIN) ||
- (card->options.layer2) ) {
+ if (!capable(CAP_NET_ADMIN)){
rc = -EPERM;
break;
}
rc = qeth_arp_add_entry(card, &arp_entry);
break;
case SIOC_QETH_ARP_REMOVE_ENTRY:
- if ( !capable(CAP_NET_ADMIN) ||
- (card->options.layer2) ) {
+ if (!capable(CAP_NET_ADMIN)){
rc = -EPERM;
break;
}
rc = qeth_arp_remove_entry(card, &arp_entry);
break;
case SIOC_QETH_ARP_FLUSH_CACHE:
- if ( !capable(CAP_NET_ADMIN) ||
- (card->options.layer2) ) {
+ if (!capable(CAP_NET_ADMIN)){
rc = -EPERM;
break;
}
in_dev = __in_dev_get(card->vlangrp->vlan_devices[vid]);
if (!in_dev)
goto out;
- for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next){
addr = qeth_get_addr_buffer(QETH_PROT_IPV4);
if (addr){
addr->u.a4.addr = ifa->ifa_address;
#define qeth_free_vlan_addresses6(card, vid) do{ ; }while(0)
#endif
-static void
-qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i,
- enum qeth_ipa_cmds ipacmd)
-{
- int rc;
- struct qeth_ipa_cmd *cmd;
- struct qeth_cmd_buffer *iob;
-
- QETH_DBF_TEXT_(trace, 4, "L2sdv%x",ipacmd);
- iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
- cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
- cmd->data.setdelvlan.vlan_id = i;
-
- rc = qeth_send_ipa_cmd(card, iob, NULL, NULL);
- if (rc) {
- PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. "
- "Continuing\n",i, card->info.if_name, rc);
- QETH_DBF_TEXT_(trace, 2, "L2VL%4x", ipacmd);
- QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card));
- QETH_DBF_TEXT_(trace, 2, "err%d", rc);
- }
-}
-
-static void
-qeth_layer2_process_vlans(struct qeth_card *card, int clear)
-{
- unsigned short i;
-
- QETH_DBF_TEXT(trace, 3, "L2prcvln");
-
- if (!card->vlangrp)
- return;
- for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
- if (card->vlangrp->vlan_devices[i] == NULL)
- continue;
- if (clear)
- qeth_layer2_send_setdelvlan(card, i, IPA_CMD_DELVLAN);
- else
- qeth_layer2_send_setdelvlan(card, i, IPA_CMD_SETVLAN);
- }
-}
-
-/*add_vid is layer 2 used only ....*/
-static void
-qeth_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
-{
- struct qeth_card *card;
-
- QETH_DBF_TEXT_(trace, 4, "aid:%d", vid);
-
- card = (struct qeth_card *) dev->priv;
- if (!card->options.layer2)
- return;
- qeth_layer2_send_setdelvlan(card, vid, IPA_CMD_SETVLAN);
-}
-
-/*... kill_vid used for both modes*/
static void
qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
{
struct qeth_card *card;
unsigned long flags;
- QETH_DBF_TEXT_(trace, 4, "kid:%d", vid);
+ QETH_DBF_TEXT(trace,4,"vlkilvid");
card = (struct qeth_card *) dev->priv;
/* free all skbs for the vlan device */
if (card->vlangrp)
card->vlangrp->vlan_devices[vid] = NULL;
spin_unlock_irqrestore(&card->vlanlock, flags);
- if (card->options.layer2)
- qeth_layer2_send_setdelvlan(card, vid, IPA_CMD_DELVLAN);
qeth_set_multicast_list(card->dev);
}
#endif
#ifdef CONFIG_QETH_IPV6
qeth_add_multicast_ipv6(card);
#endif
- if (qeth_set_thread_start_bit(card, QETH_SET_IP_THREAD) == 0)
+ if (qeth_set_thread_start_bit(card, QETH_SET_IP_THREAD) == 0)
schedule_work(&card->kernel_thread_starter);
}
int i;
QETH_DBF_TEXT(trace,4,"addmcvl");
- if ( ((card->options.layer2 == 0) &&
- (!qeth_is_supported(card,IPA_FULL_VLAN))) ||
- (card->vlangrp == NULL) )
+ if (!qeth_is_supported(card,IPA_FULL_VLAN) ||
+ (card->vlangrp == NULL))
return ;
vg = card->vlangrp;
int i;
QETH_DBF_TEXT(trace,4,"admc6vl");
- if ( ((card->options.layer2 == 0) &&
- (!qeth_is_supported(card,IPA_FULL_VLAN))) ||
- (card->vlangrp == NULL))
+ if (!qeth_is_supported(card,IPA_FULL_VLAN) ||
+ (card->vlangrp == NULL))
return ;
vg = card->vlangrp;
}
#endif /* CONFIG_QETH_IPV6 */
-static int
-qeth_layer2_send_setdelmac(struct qeth_card *card, __u8 *mac,
- enum qeth_ipa_cmds ipacmd)
-{
- struct qeth_ipa_cmd *cmd;
- struct qeth_cmd_buffer *iob;
-
- QETH_DBF_TEXT(trace, 2, "L2sdmac");
- iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4);
- cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
- cmd->data.setdelmac.mac_length = OSA_ADDR_LEN;
- memcpy(&cmd->data.setdelmac.mac, mac, OSA_ADDR_LEN);
- return qeth_send_ipa_cmd(card, iob, NULL, NULL);
-}
-
-
-static int
-qeth_layer2_set_mac_address(struct net_device *dev, void *p)
-{
- struct sockaddr *addr = p;
- struct qeth_card *card;
- int rc = 0;
-
- QETH_DBF_TEXT(trace, 3, "setmac");
-
- if (qeth_verify_dev(dev) != QETH_REAL_CARD) {
- QETH_DBF_TEXT(trace, 3, "setmcINV");
- return -EOPNOTSUPP;
- }
- card = (struct qeth_card *) dev->priv;
-
- if (!card->options.layer2) {
- PRINT_WARN("Setting MAC address on %s is not supported"
- "in Layer 3 mode.\n", dev->name);
- QETH_DBF_TEXT(trace, 3, "setmcLY3");
- return -EOPNOTSUPP;
- }
- QETH_DBF_TEXT_(trace, 3, "%s", CARD_BUS_ID(card));
- QETH_DBF_HEX(trace, 3, addr->sa_data, OSA_ADDR_LEN);
- if (card->info.layer2_mac_registered)
- rc = qeth_layer2_send_setdelmac(card, &card->dev->dev_addr[0],
- IPA_CMD_DELVMAC);
- if (rc) {
- PRINT_WARN("Error in deregistering MAC address on " \
- "device %s: x%x\n", CARD_BUS_ID(card), rc);
- QETH_DBF_TEXT_(trace, 2, "err%d", rc);
- return -EIO;
- }
- card->info.layer2_mac_registered = 0;
-
- rc = qeth_layer2_send_setdelmac(card, addr->sa_data, IPA_CMD_SETVMAC);
- if (rc) {
- PRINT_WARN("Error in registering MAC address on " \
- "device %s: x%x\n", CARD_BUS_ID(card), rc);
- QETH_DBF_TEXT_(trace, 2, "2err%d", rc);
- return -EIO;
- }
- card->info.layer2_mac_registered = 1;
- memcpy(dev->dev_addr, addr->sa_data, OSA_ADDR_LEN);
- PRINT_INFO("MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
- "successfully registered on device %s\n",
- dev->dev_addr[0],dev->dev_addr[1],dev->dev_addr[2],
- dev->dev_addr[3],dev->dev_addr[4],dev->dev_addr[5],
- dev->name);
-
- return rc;
-}
-
static void
qeth_fill_ipacmd_header(struct qeth_card *card, struct qeth_ipa_cmd *cmd,
__u8 command, enum qeth_prot_versions prot)
cmd->hdr.seqno = card->seqno.ipa;
cmd->hdr.adapter_type = qeth_get_ipa_adp_type(card->info.link_type);
cmd->hdr.rel_adapter_no = (__u8) card->info.portno;
- if (card->options.layer2)
- cmd->hdr.prim_version_no = 2;
- else
- cmd->hdr.prim_version_no = 1;
+ cmd->hdr.prim_version_no = 1;
cmd->hdr.param_count = 1;
cmd->hdr.prot_version = prot;
cmd->hdr.ipa_supported = 0;
}
static int
-qeth_layer2_register_addr_entry(struct qeth_card *card,
- struct qeth_ipaddr *addr)
-{
- int rc = 0;
-
- if (!addr->is_multicast)
- return 0;
-
- QETH_DBF_TEXT(trace, 2, "setgmac");
- QETH_DBF_HEX(trace,3,&addr->mac[0],OSA_ADDR_LEN);
- rc = qeth_layer2_send_setdelmac(card, &addr->mac[0],
- IPA_CMD_SETGMAC);
- if (rc)
- PRINT_ERR("Could not set group MAC " \
- "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
- addr->mac[0],addr->mac[1],addr->mac[2],
- addr->mac[3],addr->mac[4],addr->mac[5],
- card->info.if_name,rc);
- return rc;
-}
-
-static int
-qeth_layer2_deregister_addr_entry(struct qeth_card *card,
- struct qeth_ipaddr *addr)
-{
- int rc = 0;
-
- if (!addr->is_multicast)
- return 0;
-
- QETH_DBF_TEXT(trace, 2, "delgmac");
- QETH_DBF_HEX(trace,3,&addr->mac[0],OSA_ADDR_LEN);
- rc = qeth_layer2_send_setdelmac(card, &addr->mac[0],
- IPA_CMD_DELGMAC);
- if (rc)
- PRINT_ERR("Could not delete group MAC " \
- "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
- addr->mac[0],addr->mac[1],addr->mac[2],
- addr->mac[3],addr->mac[4],addr->mac[5],
- card->info.if_name,rc);
- return rc;
-
-}
-
-static int
-qeth_layer3_register_addr_entry(struct qeth_card *card,
- struct qeth_ipaddr *addr)
+qeth_register_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
{
//char buf[50];
int rc;
}
static int
-qeth_layer3_deregister_addr_entry(struct qeth_card *card,
- struct qeth_ipaddr *addr)
+qeth_deregister_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
{
//char buf[50];
int rc;
return rc;
}
-static int
-qeth_register_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
-{
- if (card->options.layer2)
- return qeth_layer2_register_addr_entry(card, addr);
-
- return qeth_layer3_register_addr_entry(card, addr);
-}
-
-static int
-qeth_deregister_addr_entry(struct qeth_card *card, struct qeth_ipaddr *addr)
-{
- if (card->options.layer2)
- return qeth_layer2_deregister_addr_entry(card, addr);
-
- return qeth_layer3_deregister_addr_entry(card, addr);
-}
-
static int
qeth_netdev_init(struct net_device *dev)
{
#ifdef CONFIG_QETH_VLAN
dev->vlan_rx_register = qeth_vlan_rx_register;
dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid;
- dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid;
#endif
- if (qeth_get_netdev_flags(card) & IFF_NOARP) {
+ if (qeth_get_netdev_flags(card->info.type) & IFF_NOARP) {
dev->rebuild_header = NULL;
dev->hard_header = NULL;
dev->header_cache_update = NULL;
#endif
dev->hard_header_parse = NULL;
- dev->set_mac_address = qeth_layer2_set_mac_address;
- dev->flags |= qeth_get_netdev_flags(card);
+ dev->set_mac_address = NULL;
+ dev->flags |= qeth_get_netdev_flags(card->info.type);
if ((card->options.fake_broadcast) ||
(card->info.broadcast_capable))
dev->flags |= IFF_BROADCAST;
+
dev->hard_header_len =
- qeth_get_hlen(card->info.link_type) + card->options.add_hhlen;
+ qeth_get_hlen(card->info.link_type) + card->options.add_hhlen;
dev->addr_len = OSA_ADDR_LEN;
dev->mtu = card->info.initial_mtu;
return rc;
}
-static int
-qeth_layer2_initialize(struct qeth_card *card)
-{
- int rc = 0;
-
-
- QETH_DBF_TEXT(setup, 2, "doL2init");
- QETH_DBF_TEXT_(setup, 2, "doL2%s", CARD_BUS_ID(card));
-
- rc = qeth_setadpparms_change_macaddr(card);
- if (rc) {
- PRINT_WARN("couldn't get MAC address on "
- "device %s: x%x\n",
- CARD_BUS_ID(card), rc);
- QETH_DBF_TEXT_(setup, 2,"1err%d",rc);
- return rc;
- }
- QETH_DBF_HEX(setup,2, card->dev->dev_addr, OSA_ADDR_LEN);
-
- rc = qeth_layer2_send_setdelmac(card, &card->dev->dev_addr[0],
- IPA_CMD_SETVMAC);
- if (rc) {
- card->info.layer2_mac_registered = 0;
- PRINT_WARN("Error in processing MAC address on " \
- "device %s: x%x\n",CARD_BUS_ID(card),rc);
- QETH_DBF_TEXT_(setup, 2,"2err%d",rc);
- } else
- card->info.layer2_mac_registered = 1;
- return 0;
-}
-
static int
qeth_send_startstoplan(struct qeth_card *card, enum qeth_ipa_cmds ipacmd,
struct qeth_cmd_buffer *iob;
QETH_DBF_TEXT_(setup, 2, "qipassi%i", prot);
- if (card->options.layer2) {
- QETH_DBF_TEXT(setup, 2, "noprmly2");
- return -EPERM;
- }
iob = qeth_get_ipacmd_buffer(card,IPA_CMD_QIPASSIST,prot);
rc = qeth_send_ipa_cmd(card, iob, qeth_query_ipassists_cb, NULL);
card->info.if_name, rc);
} else {
PRINT_INFO("VLAN enabled \n");
- card->dev->features |=
- NETIF_F_HW_VLAN_FILTER |
- NETIF_F_HW_VLAN_TX |
- NETIF_F_HW_VLAN_RX;
+ card->dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
}
#endif /* QETH_VLAN */
return rc;
return rc;
} else
card->lan_online = 1;
- if (card->options.layer2) {
- card->dev->features |=
- NETIF_F_HW_VLAN_FILTER |
- NETIF_F_HW_VLAN_TX |
- NETIF_F_HW_VLAN_RX;
- card->dev->flags|=IFF_MULTICAST|IFF_BROADCAST;
- card->info.broadcast_capable=1;
- if ((rc = qeth_layer2_initialize(card))) {
- QETH_DBF_TEXT_(setup, 2, "L2err%d", rc);
- return rc;
- }
-#ifdef CONFIG_QETH_VLAN
- qeth_layer2_process_vlans(card, 0);
-#endif
- goto out;
- }
if ((rc = qeth_setadapter_parms(card)))
QETH_DBF_TEXT_(setup, 2, "2err%d", rc);
if ((rc = qeth_start_ipassists(card)))
QETH_DBF_TEXT_(setup, 2, "4err%d", rc);
if ((rc = qeth_setrouting_v6(card)))
QETH_DBF_TEXT_(setup, 2, "5err%d", rc);
-out:
netif_stop_queue(card->dev);
return 0;
}
static int
qeth_stop_card(struct qeth_card *card)
{
+ int recover_flag = 0;
int rc = 0;
QETH_DBF_TEXT(setup ,2,"stopcard");
if (card->read.state == CH_STATE_UP &&
card->write.state == CH_STATE_UP &&
(card->state == CARD_STATE_UP)) {
+ recover_flag = 1;
rtnl_lock();
dev_close(card->dev);
rtnl_unlock();
- if (!card->use_hard_stop) {
- __u8 *mac = &card->dev->dev_addr[0];
- if ((rc = qeth_layer2_send_setdelmac(card, mac,
- IPA_CMD_DELVMAC)));
- QETH_DBF_TEXT_(setup, 2, "Lerr%d", rc);
+ if (!card->use_hard_stop)
if ((rc = qeth_send_stoplan(card)))
QETH_DBF_TEXT_(setup, 2, "1err%d", rc);
- }
card->state = CARD_STATE_SOFTSETUP;
}
if (card->state == CARD_STATE_SOFTSETUP) {
-#ifdef CONFIG_QETH_VLAN
- if (card->options.layer2)
- qeth_layer2_process_vlans(card, 1);
-#endif
- qeth_clear_ip_list(card, !card->use_hard_stop, 1);
+ qeth_clear_ip_list(card, !card->use_hard_stop, recover_flag);
qeth_clear_ipacmd_list(card);
card->state = CARD_STATE_HARDSETUP;
}
if (card->state == CARD_STATE_HARDSETUP) {
- if ((!card->use_hard_stop) &&
- (!card->options.layer2))
+ if (!card->use_hard_stop)
if ((rc = qeth_put_unique_id(card)))
QETH_DBF_TEXT_(setup, 2, "2err%d", rc);
qeth_qdio_clear_card(card, 0);
rtnl_lock();
dev_open(card->dev);
rtnl_unlock();
- /* this also sets saved unicast addresses */
qeth_set_multicast_list(card->dev);
}
-
-/* Layer 2 specific stuff */
-#define IGNORE_PARAM_EQ(option,value,reset_value,msg) \
- if (card->options.option == value) { \
- PRINT_ERR("%s not supported with layer 2 " \
- "functionality, ignoring option on read" \
- "channel device %s .\n",msg,CARD_RDEV_ID(card)); \
- card->options.option = reset_value; \
- }
-#define IGNORE_PARAM_NEQ(option,value,reset_value,msg) \
- if (card->options.option != value) { \
- PRINT_ERR("%s not supported with layer 2 " \
- "functionality, ignoring option on read" \
- "channel device %s .\n",msg,CARD_RDEV_ID(card)); \
- card->options.option = reset_value; \
- }
-
-
-static void qeth_make_parameters_consistent(struct qeth_card *card)
-{
-
- if (card->options.layer2) {
- if (card->info.type == QETH_CARD_TYPE_IQD) {
- PRINT_ERR("Device %s does not support " \
- "layer 2 functionality. " \
- "Ignoring layer2 option.\n",CARD_BUS_ID(card));
- }
- IGNORE_PARAM_NEQ(route4.type, NO_ROUTER, NO_ROUTER,
- "Routing options are");
-#ifdef CONFIG_QETH_IPV6
- IGNORE_PARAM_NEQ(route6.type, NO_ROUTER, NO_ROUTER,
- "Routing options are");
-#endif
- IGNORE_PARAM_EQ(checksum_type, HW_CHECKSUMMING,
- QETH_CHECKSUM_DEFAULT,
- "Checksumming options are");
- IGNORE_PARAM_NEQ(broadcast_mode, QETH_TR_BROADCAST_ALLRINGS,
- QETH_TR_BROADCAST_ALLRINGS,
- "Broadcast mode options are");
- IGNORE_PARAM_NEQ(macaddr_mode, QETH_TR_MACADDR_NONCANONICAL,
- QETH_TR_MACADDR_NONCANONICAL,
- "Canonical MAC addr options are");
- IGNORE_PARAM_NEQ(fake_broadcast, 0, 0,
- "Broadcast faking options are");
- IGNORE_PARAM_NEQ(add_hhlen, DEFAULT_ADD_HHLEN,
- DEFAULT_ADD_HHLEN,"Option add_hhlen is");
- IGNORE_PARAM_NEQ(fake_ll, 0, 0,"Option fake_ll is");
- }
-}
-
-
static int
qeth_set_online(struct ccwgroup_device *gdev)
{
return -EIO;
}
- if (card->options.layer2)
- qeth_make_parameters_consistent(card);
-
if ((rc = qeth_hardsetup_card(card))){
QETH_DBF_TEXT_(setup, 2, "2err%d", rc);
goto out_remove;
}
card->state = CARD_STATE_HARDSETUP;
- if (!(rc = qeth_query_ipassists(card,QETH_PROT_IPV4)))
+ if ((rc = qeth_query_ipassists(card,QETH_PROT_IPV4))){
+ QETH_DBF_TEXT_(setup, 2, "3err%d", rc);
+ /*TODO: rc !=0*/
+ } else
rc = qeth_get_unique_id(card);
- if (rc && card->options.layer2 == 0) {
- QETH_DBF_TEXT_(setup, 2, "3err%d", rc);
+ if (rc) {
+ QETH_DBF_TEXT_(setup, 2, "4err%d", rc);
goto out_remove;
}
qeth_print_status_message(card);
if ((rc = qeth_register_netdev(card))){
- QETH_DBF_TEXT_(setup, 2, "4err%d", rc);
+ QETH_DBF_TEXT_(setup, 2, "5err%d", rc);
goto out_remove;
}
if ((rc = qeth_softsetup_card(card))){
- QETH_DBF_TEXT_(setup, 2, "5err%d", rc);
+ QETH_DBF_TEXT_(setup, 2, "6err%d", rc);
goto out_remove;
}
card->state = CARD_STATE_SOFTSETUP;
if ((rc = qeth_init_qdio_queues(card))){
- QETH_DBF_TEXT_(setup, 2, "6err%d", rc);
+ QETH_DBF_TEXT_(setup, 2, "7err%d", rc);
goto out_remove;
}
/*maybe it was set offline without ifconfig down
* we can also use this state for recovery purposes*/
- if (card->options.layer2)
- qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 0);
- else
- qeth_set_allowed_threads(card, 0xffffffff, 0);
+ qeth_set_allowed_threads(card, 0xffffffff, 0);
if (recover_flag == CARD_STATE_RECOVER)
qeth_start_again(card);
qeth_notify_processes();
struct net_device *dev = neigh->dev;
struct in_device *in_dev;
struct neigh_parms *parms;
- struct qeth_card *card;
- card = qeth_get_card_from_dev(dev);
- if (card == NULL)
- goto out;
- if(card->options.layer2)
- goto out;
+ if (!qeth_verify_dev(dev)) {
+ return qeth_old_arp_constructor(neigh);
+ }
rcu_read_lock();
in_dev = rcu_dereference(__in_dev_get(dev));
neigh->ops = arp_direct_ops;
neigh->output = neigh->ops->queue_xmit;
return 0;
-out:
- return qeth_old_arp_constructor(neigh);
}
#endif /*CONFIG_QETH_IPV6*/
card = qeth_get_card_from_dev(dev);
if (!card)
return NOTIFY_DONE;
- if (card->options.layer2)
- return NOTIFY_DONE;
addr = qeth_get_addr_buffer(QETH_PROT_IPV4);
if (addr != NULL) {
git://git.onelab.eu / linux-2.6.git / blobdiff