On Wed, 2013-09-18 at 11:12 +0100, Kevin Curtis wrote:
> Farsite Communications FarSync driver update
>
> Patch 4 of 7
> Note that this patch must be applied with patch 5 (farsync_driver_patch)
Then don't make them separate patches.
> Update the existing farsync.h file for the new features of the farsync and
> flex drivers.
>
> Signed-off-by: Kevin Curtis <kevin.curtis@xxxxxxxxxxx>
>
> ---
> diff -uprN -X linux-3.10.1/Documentation/dontdiff linux-3.10.1/drivers/net/wan/farsync.h linux-3.10.1_new/drivers/net/wan/farsync.h
> --- linux-3.10.1/drivers/net/wan/farsync.h 2013-07-13 19:42:41.000000000 +0100
> +++ linux-3.10.1_new/drivers/net/wan/farsync.h 2013-09-16 16:30:06.483104880 +0100
[...]
> +#ifdef __x86_64__
> +#define FST_PLATFORM "64bit"
> +#else
> +#define FST_PLATFORM "32bit"
> +#endif
Really, there are a lot more 64-bit architectures than that...
> +#define FST_ADDITIONAL FST_BUILD_NO
> +
> +#define FST_INCLUDES_CHAR
> +
> +struct fst_device_stats {
> + unsigned long rx_packets; /* total packets received */
> + unsigned long tx_packets; /* total packets transmitted */
> + unsigned long rx_bytes; /* total bytes received */
> + unsigned long tx_bytes; /* total bytes transmitted */
> + unsigned long rx_errors; /* bad packets received */
> + unsigned long tx_errors; /* packet transmit problems */
> + unsigned long rx_dropped; /* no space in linux buffers */
> + unsigned long tx_dropped; /* no space available in linux */
> + unsigned long multicast; /* multicast packets received */
> + unsigned long collisions;
> +
> + /* detailed rx_errors: */
> + unsigned long rx_length_errors;
> + unsigned long rx_over_errors; /* receiver ring buff overflow */
> + unsigned long rx_crc_errors; /* recved pkt with crc error */
> + unsigned long rx_frame_errors; /* recv'd frame alignment error */
> + unsigned long rx_fifo_errors; /* recv'r fifo overrun */
> + unsigned long rx_missed_errors; /* receiver missed packet */
> +
> + /* detailed tx_errors */
> + unsigned long tx_aborted_errors;
> + unsigned long tx_carrier_errors;
> + unsigned long tx_fifo_errors;
> + unsigned long tx_heartbeat_errors;
> + unsigned long tx_underrun_errors;
> +
> + /* for cslip etc */
> + unsigned long rx_compressed;
> + unsigned long tx_compressed;
> +};
Why do you need your own copy of struct net_device_stats?
[...]
> /* Ioctl call command values
> + *
> + * The first three private ioctls are used by the sync-PPP module,
> + * allowing a little room for expansion we start our numbering at 10.
> */
> -#define FSTWRITE (SIOCDEVPRIVATE+10)
> -#define FSTCPURESET (SIOCDEVPRIVATE+11)
> -#define FSTCPURELEASE (SIOCDEVPRIVATE+12)
> -#define FSTGETCONF (SIOCDEVPRIVATE+13)
> -#define FSTSETCONF (SIOCDEVPRIVATE+14)
> -
> +#define FSTWRITE (SIOCDEVPRIVATE+4)
> +#define FSTCPURESET (SIOCDEVPRIVATE+5)
> +#define FSTCPURELEASE (SIOCDEVPRIVATE+6)
> +#define FSTGETCONF (SIOCDEVPRIVATE+7)
> +#define FSTSETCONF (SIOCDEVPRIVATE+8)
> +#define FSTSNOTIFY (SIOCDEVPRIVATE+9)
> +#define FSTGSTATE (SIOCDEVPRIVATE+10)
> +#define FSTSYSREQ (SIOCDEVPRIVATE+11)
> +#define FSTGETSHELL (SIOCDEVPRIVATE+12)
> +#define FSTSETMON (SIOCDEVPRIVATE+13)
> +#define FSTSETPORT (SIOCDEVPRIVATE+14)
> +#define FSTCMD (SIOCDEVPRIVATE+15)
[...]
No, you must never renumber ioctls once they're used in production.
It's hard to know what other changes you're making, because of all the
whitespace fixes. It would be clearer if you fixed up the whitespace in
the existing header as a preparatory patch.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
