net-next: ax88796: Add block_input/output hooks to ax_plat_data

Add platform specific hooks for block transfer reads/writes of packet
buffer data, superseding the default provided ax_block_input/output.
Currently used for m68k Amiga XSurf100.

Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index d3f30f1c40b2353f1cee35479c127a3988c0cb30..939a572a19ff914a209cac30d04ad83b6b3cdcb0 100644 (file)
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -758,8 +758,14 @@ static int ax_init_dev(struct net_device *dev)
 #endif
 
        ei_local->reset_8390 = &ax_reset_8390;
-       ei_local->block_input = &ax_block_input;
-       ei_local->block_output = &ax_block_output;
+       if (ax->plat->block_input)
+               ei_local->block_input = ax->plat->block_input;
+       else
+               ei_local->block_input = &ax_block_input;
+       if (ax->plat->block_output)
+               ei_local->block_output = ax->plat->block_output;
+       else
+               ei_local->block_output = &ax_block_output;
        ei_local->get_8390_hdr = &ax_get_8390_hdr;
        ei_local->priv = 0;
 

diff --git a/include/net/ax88796.h b/include/net/ax88796.h
index b9a3beca0ce41589cdcc4685068ef1dfda975235..363b0ca5f7e8a633b8366a754522e6659116ded7 100644 (file)
--- a/include/net/ax88796.h
+++ b/include/net/ax88796.h
@@ -12,6 +12,9 @@
 #ifndef __NET_AX88796_PLAT_H
 #define __NET_AX88796_PLAT_H
 
+struct sk_buff;
+struct net_device;
+
 #define AXFLG_HAS_EEPROM               (1<<0)
 #define AXFLG_MAC_FROMDEV              (1<<1)  /* device already has MAC */
 #define AXFLG_HAS_93CX6                        (1<<2)  /* use eeprom_93cx6 driver */
@@ -26,6 +29,12 @@ struct ax_plat_data {
        u32             *reg_offsets;   /* register offsets */
        u8              *mac_addr;      /* MAC addr (only used when
                                           AXFLG_MAC_FROMPLATFORM is used */
+
+       /* uses default ax88796 buffer if set to NULL */
+       void (*block_output)(struct net_device *dev, int count,
+                       const unsigned char *buf, int star_page);
+       void (*block_input)(struct net_device *dev, int count,
+                       struct sk_buff *skb, int ring_offset);
 };
 
 #endif /* __NET_AX88796_PLAT_H */