mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-31 14:04:26 -04:00 
			
		
		
		
	All patches automatically rebased.
Build system: x86_64
Build-tested: ramips/mt7621*
*FS#4149 affects me so I had to revert 7f1edbd412
in order to downgrade to 2.35.1
Signed-off-by: John Audia <graysky@archlinux.us>
		
	
			
		
			
				
	
	
		
			58 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			58 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 1f7c79cacbb448420929fc3b5261b9616b5d8f6d Mon Sep 17 00:00:00 2001
 | |
| From: Yangbo Lu <yangbo.lu@nxp.com>
 | |
| Date: Wed, 20 Nov 2019 16:23:14 +0800
 | |
| Subject: [PATCH] net: mscc: ocelot: export ocelot_hwstamp_get/set functions
 | |
| 
 | |
| Export ocelot_hwstamp_get/set functions so that DSA driver
 | |
| is able to reuse them.
 | |
| 
 | |
| Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 | |
| Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 | |
| Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
 | |
| Signed-off-by: David S. Miller <davem@davemloft.net>
 | |
| ---
 | |
|  drivers/net/ethernet/mscc/ocelot.c | 8 ++++----
 | |
|  include/soc/mscc/ocelot.h          | 2 ++
 | |
|  2 files changed, 6 insertions(+), 4 deletions(-)
 | |
| 
 | |
| --- a/drivers/net/ethernet/mscc/ocelot.c
 | |
| +++ b/drivers/net/ethernet/mscc/ocelot.c
 | |
| @@ -1049,15 +1049,14 @@ static int ocelot_get_port_parent_id(str
 | |
|  	return 0;
 | |
|  }
 | |
|  
 | |
| -static int ocelot_hwstamp_get(struct ocelot *ocelot, int port,
 | |
| -			      struct ifreq *ifr)
 | |
| +int ocelot_hwstamp_get(struct ocelot *ocelot, int port, struct ifreq *ifr)
 | |
|  {
 | |
|  	return copy_to_user(ifr->ifr_data, &ocelot->hwtstamp_config,
 | |
|  			    sizeof(ocelot->hwtstamp_config)) ? -EFAULT : 0;
 | |
|  }
 | |
| +EXPORT_SYMBOL(ocelot_hwstamp_get);
 | |
|  
 | |
| -static int ocelot_hwstamp_set(struct ocelot *ocelot, int port,
 | |
| -			      struct ifreq *ifr)
 | |
| +int ocelot_hwstamp_set(struct ocelot *ocelot, int port, struct ifreq *ifr)
 | |
|  {
 | |
|  	struct ocelot_port *ocelot_port = ocelot->ports[port];
 | |
|  	struct hwtstamp_config cfg;
 | |
| @@ -1114,6 +1113,7 @@ static int ocelot_hwstamp_set(struct oce
 | |
|  
 | |
|  	return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;
 | |
|  }
 | |
| +EXPORT_SYMBOL(ocelot_hwstamp_set);
 | |
|  
 | |
|  static int ocelot_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 | |
|  {
 | |
| --- a/include/soc/mscc/ocelot.h
 | |
| +++ b/include/soc/mscc/ocelot.h
 | |
| @@ -533,6 +533,8 @@ int ocelot_fdb_del(struct ocelot *ocelot
 | |
|  int ocelot_vlan_add(struct ocelot *ocelot, int port, u16 vid, bool pvid,
 | |
|  		    bool untagged);
 | |
|  int ocelot_vlan_del(struct ocelot *ocelot, int port, u16 vid);
 | |
| +int ocelot_hwstamp_get(struct ocelot *ocelot, int port, struct ifreq *ifr);
 | |
| +int ocelot_hwstamp_set(struct ocelot *ocelot, int port, struct ifreq *ifr);
 | |
|  int ocelot_ptp_gettime64(struct ptp_clock_info *ptp, struct timespec64 *ts);
 | |
|  void ocelot_get_hwtimestamp(struct ocelot *ocelot, struct timespec64 *ts);
 | |
|  
 |