← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to include/linux/ethtool.h

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/ethtool.h
13
13
#ifndef _LINUX_ETHTOOL_H
14
14
#define _LINUX_ETHTOOL_H
15
15
 
 
16
#ifdef __KERNEL__
 
17
#include <linux/compat.h>
 
18
#endif
16
19
#include <linux/types.h>
17
20
#include <linux/if_ether.h>
18
21
 
449
452
        __u32                           rule_locs[0];
450
453
};
451
454
 
 
455
#ifdef __KERNEL__
 
456
#ifdef CONFIG_COMPAT
 
457
 
 
458
struct compat_ethtool_rx_flow_spec {
 
459
        u32             flow_type;
 
460
        union {
 
461
                struct ethtool_tcpip4_spec              tcp_ip4_spec;
 
462
                struct ethtool_tcpip4_spec              udp_ip4_spec;
 
463
                struct ethtool_tcpip4_spec              sctp_ip4_spec;
 
464
                struct ethtool_ah_espip4_spec           ah_ip4_spec;
 
465
                struct ethtool_ah_espip4_spec           esp_ip4_spec;
 
466
                struct ethtool_usrip4_spec              usr_ip4_spec;
 
467
                struct ethhdr                           ether_spec;
 
468
                u8                                      hdata[72];
 
469
        } h_u, m_u;
 
470
        compat_u64      ring_cookie;
 
471
        u32             location;
 
472
};
 
473
 
 
474
struct compat_ethtool_rxnfc {
 
475
        u32                             cmd;
 
476
        u32                             flow_type;
 
477
        compat_u64                      data;
 
478
        struct compat_ethtool_rx_flow_spec fs;
 
479
        u32                             rule_cnt;
 
480
        u32                             rule_locs[0];
 
481
};
 
482
 
 
483
#endif /* CONFIG_COMPAT */
 
484
#endif /* __KERNEL__ */
 
485
 
452
486
/**
453
487
 * struct ethtool_rxfh_indir - command to get or set RX flow hash indirection
454
488
 * @cmd: Specific command number - %ETHTOOL_GRXFHINDIR or %ETHTOOL_SRXFHINDIR