mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
5075314e4e
This change addresses several issues. First, it was possible to set tag_protocol without setting the ops pointer. To correct that I have reordered things so that rcv is now populated before we set tag_protocol. Second, it didn't make much sense to keep setting the device ops each time a new slave was registered. So by moving the receive portion out into root switch initialization that issue should be addressed. Third, I wanted to avoid sending tags if the rcv pointer was not registered so I changed the tag check to verify if the rcv function pointer is set on the root tree. If it is then we start sending DSA tagged frames. Finally I split the device ops pointer in the structures into two spots. I placed the rcv function pointer in the root switch since this makes it easiest to access from there, and I placed the xmit function pointer in the slave for the same reason. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
73 lines
1.7 KiB
C
73 lines
1.7 KiB
C
/*
|
|
* net/dsa/dsa_priv.h - Hardware switch handling
|
|
* Copyright (c) 2008-2009 Marvell Semiconductor
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef __DSA_PRIV_H
|
|
#define __DSA_PRIV_H
|
|
|
|
#include <linux/phy.h>
|
|
#include <linux/netdevice.h>
|
|
|
|
struct dsa_device_ops {
|
|
netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);
|
|
int (*rcv)(struct sk_buff *skb, struct net_device *dev,
|
|
struct packet_type *pt, struct net_device *orig_dev);
|
|
};
|
|
|
|
struct dsa_slave_priv {
|
|
/*
|
|
* The linux network interface corresponding to this
|
|
* switch port.
|
|
*/
|
|
struct net_device *dev;
|
|
netdev_tx_t (*xmit)(struct sk_buff *skb,
|
|
struct net_device *dev);
|
|
|
|
/*
|
|
* Which switch this port is a part of, and the port index
|
|
* for this port.
|
|
*/
|
|
struct dsa_switch *parent;
|
|
u8 port;
|
|
|
|
/*
|
|
* The phylib phy_device pointer for the PHY connected
|
|
* to this port.
|
|
*/
|
|
struct phy_device *phy;
|
|
phy_interface_t phy_interface;
|
|
int old_link;
|
|
int old_pause;
|
|
int old_duplex;
|
|
};
|
|
|
|
/* dsa.c */
|
|
extern char dsa_driver_version[];
|
|
|
|
/* slave.c */
|
|
extern const struct dsa_device_ops notag_netdev_ops;
|
|
void dsa_slave_mii_bus_init(struct dsa_switch *ds);
|
|
struct net_device *dsa_slave_create(struct dsa_switch *ds,
|
|
struct device *parent,
|
|
int port, char *name);
|
|
|
|
/* tag_dsa.c */
|
|
extern const struct dsa_device_ops dsa_netdev_ops;
|
|
|
|
/* tag_edsa.c */
|
|
extern const struct dsa_device_ops edsa_netdev_ops;
|
|
|
|
/* tag_trailer.c */
|
|
extern const struct dsa_device_ops trailer_netdev_ops;
|
|
|
|
/* tag_brcm.c */
|
|
extern const struct dsa_device_ops brcm_netdev_ops;
|
|
|
|
|
|
#endif
|