getvar() {
eval "echo \"\${$1}\""
}
var2file() {
local var
eval "var=\"\${$1}\""
if [ -n "$var" ]; then echo "$var" > "$2"; fi
}
isset() {
local var
eval "var=\"\${$1}\""
[ -n "$var" ]
}
trapret() {(
local retvals="$1"; shift
local cmd="$1"; shift
for retval in $(echo $retvals); do
local trap_$retval=1
done
"$cmd" "$@" || {
local retval="$?"
eval "trapped=\${trap_$retval}"
[ -n "$trapped" ] || {
return $retval
}
}
)}
md5s() {
cat "$@" | (
md5sum 2>/dev/null ||
md5
) | awk '{print $1}'
}
href='ssh://git@git.panaceas.org/git/openwrt/upstream' title='openwrt/upstream Git repository'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/cgit/'>index</a> : <a title='openwrt/upstream' href='/cgit/openwrt/upstream/'>openwrt/upstream</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='f26378fd7c2d7677732f16c93d0e9df366891d05'/><select name='h' onchange='this.form.submit();'>
<option value='attitude_adjustment'>attitude_adjustment</option>
<option value='barrier_breaker'>barrier_breaker</option>
<option value='chaos_calmer'>chaos_calmer</option>
<option value='lede-17.01'>lede-17.01</option>
<option value='less-old-master'>less-old-master</option>
<option value='master'>master</option>
<option value='old-master'>old-master</option>
<option value='openwrt-18.06'>openwrt-18.06</option>
<option value='openwrt-19.07'>openwrt-19.07</option>
<option value='upstream'>upstream</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>upstream openwrt</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/openwrt/upstream/about/?h=v22.03.1'>about</a><a href='/cgit/openwrt/upstream/?h=v22.03.1'>summary</a><a href='/cgit/openwrt/upstream/refs/?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>refs</a><a href='/cgit/openwrt/upstream/log/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1'>log</a><a class='active' href='/cgit/openwrt/upstream/tree/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>tree</a><a href='/cgit/openwrt/upstream/commit/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>commit</a><a href='/cgit/openwrt/upstream/diff/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>diff</a><a href='/cgit/openwrt/upstream/stats/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/openwrt/upstream/log/target/linux/generic/patches-3.9/721-phy_packets.patch'>
<input type='hidden' name='h' value='v22.03.1'/><input type='hidden' name='id' value='f26378fd7c2d7677732f16c93d0e9df366891d05'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/openwrt/upstream/tree/?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>root</a>/<a href='/cgit/openwrt/upstream/tree/target?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>target</a>/<a href='/cgit/openwrt/upstream/tree/target/linux?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>linux</a>/<a href='/cgit/openwrt/upstream/tree/target/linux/generic?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>generic</a>/<a href='/cgit/openwrt/upstream/tree/target/linux/generic/patches-3.9?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>patches-3.9</a>/<a href='/cgit/openwrt/upstream/tree/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>721-phy_packets.patch</a></div><div class='content'>blob: 5af812199bb6be95810ca54a439c0c571f221c94 (<a href='/cgit/openwrt/upstream/plain/target/linux/generic/patches-3.9/721-phy_packets.patch?h=v22.03.1&id=f26378fd7c2d7677732f16c93d0e9df366891d05'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
<a id='n102' href='#n102'>102</a>
<a id='n103' href='#n103'>103</a>
<a id='n104' href='#n104'>104</a>
<a id='n105' href='#n105'>105</a>
<a id='n106' href='#n106'>106</a>
<a id='n107' href='#n107'>107</a>
<a id='n108' href='#n108'>108</a>
<a id='n109' href='#n109'>109</a>
<a id='n110' href='#n110'>110</a>
<a id='n111' href='#n111'>111</a>
<a id='n112' href='#n112'>112</a>
<a id='n113' href='#n113'>113</a>
<a id='n114' href='#n114'>114</a>
<a id='n115' href='#n115'>115</a>
<a id='n116' href='#n116'>116</a>
<a id='n117' href='#n117'>117</a>
<a id='n118' href='#n118'>118</a>
<a id='n119' href='#n119'>119</a>
<a id='n120' href='#n120'>120</a>
<a id='n121' href='#n121'>121</a>
<a id='n122' href='#n122'>122</a>
<a id='n123' href='#n123'>123</a>
<a id='n124' href='#n124'>124</a>
<a id='n125' href='#n125'>125</a>
<a id='n126' href='#n126'>126</a>
<a id='n127' href='#n127'>127</a>
<a id='n128' href='#n128'>128</a>
<a id='n129' href='#n129'>129</a>
<a id='n130' href='#n130'>130</a>
<a id='n131' href='#n131'>131</a>
<a id='n132' href='#n132'>132</a>
<a id='n133' href='#n133'>133</a>
<a id='n134' href='#n134'>134</a>
<a id='n135' href='#n135'>135</a>
<a id='n136' href='#n136'>136</a>
<a id='n137' href='#n137'>137</a>
<a id='n138' href='#n138'>138</a>
<a id='n139' href='#n139'>139</a>
<a id='n140' href='#n140'>140</a>
<a id='n141' href='#n141'>141</a>
<a id='n142' href='#n142'>142</a>
<a id='n143' href='#n143'>143</a>
<a id='n144' href='#n144'>144</a>
<a id='n145' href='#n145'>145</a>
<a id='n146' href='#n146'>146</a>
<a id='n147' href='#n147'>147</a>
<a id='n148' href='#n148'>148</a>
<a id='n149' href='#n149'>149</a>
<a id='n150' href='#n150'>150</a>
<a id='n151' href='#n151'>151</a>
<a id='n152' href='#n152'>152</a>
<a id='n153' href='#n153'>153</a>
<a id='n154' href='#n154'>154</a>
<a id='n155' href='#n155'>155</a>
<a id='n156' href='#n156'>156</a>
<a id='n157' href='#n157'>157</a>
<a id='n158' href='#n158'>158</a>
<a id='n159' href='#n159'>159</a>
<a id='n160' href='#n160'>160</a>
<a id='n161' href='#n161'>161</a>
<a id='n162' href='#n162'>162</a>
<a id='n163' href='#n163'>163</a>
<a id='n164' href='#n164'>164</a>
<a id='n165' href='#n165'>165</a>
<a id='n166' href='#n166'>166</a>
<a id='n167' href='#n167'>167</a>
<a id='n168' href='#n168'>168</a>
<a id='n169' href='#n169'>169</a>
<a id='n170' href='#n170'>170</a>
<a id='n171' href='#n171'>171</a>
<a id='n172' href='#n172'>172</a>
<a id='n173' href='#n173'>173</a>
<a id='n174' href='#n174'>174</a>
<a id='n175' href='#n175'>175</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; margin: 0; }
td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight { background: #ffffff; }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="gd">--- a/include/linux/netdevice.h</span>
<span class="gi">+++ b/include/linux/netdevice.h</span>
<span class="gu">@@ -1109,6 +1109,11 @@ struct net_device {</span>
const struct net_device_ops *netdev_ops;
const struct ethtool_ops *ethtool_ops;
<span class="gi">+#ifdef CONFIG_ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb);</span>
<span class="gi">+ struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb);</span>
<span class="gi">+#endif</span>
<span class="gi">+</span>
/* Hardware header description */
const struct header_ops *header_ops;
<span class="gu">@@ -1165,6 +1170,9 @@ struct net_device {</span>
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
<span class="gi">+#ifdef CONFIG_ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ void *phy_ptr; /* PHY device specific data */</span>
<span class="gi">+#endif</span>
/*
* Cache lines mostly used on receive path (including eth_type_trans())
<span class="gd">--- a/include/uapi/linux/if.h</span>
<span class="gi">+++ b/include/uapi/linux/if.h</span>
<span class="gu">@@ -83,6 +83,7 @@</span>
#define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */
#define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address
* change when it's running */
<span class="gi">+#define IFF_NO_IP_ALIGN 0x200000 /* do not ip-align allocated rx pkts */</span>
#define IF_GET_IFACE 0x0001 /* for querying only */
<span class="gd">--- a/include/linux/skbuff.h</span>
<span class="gi">+++ b/include/linux/skbuff.h</span>
<span class="gu">@@ -1781,6 +1781,10 @@ static inline int pskb_trim(struct sk_bu</span>
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
<span class="gi">+extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,</span>
<span class="gi">+ unsigned int length, gfp_t gfp);</span>
<span class="gi">+</span>
<span class="gi">+</span>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
<span class="gu">@@ -1887,16 +1891,6 @@ static inline struct sk_buff *dev_alloc_</span>
}
<span class="gd">-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,</span>
<span class="gd">- unsigned int length, gfp_t gfp)</span>
<span class="gd">-{</span>
<span class="gd">- struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);</span>
<span class="gd">-</span>
<span class="gd">- if (NET_IP_ALIGN && skb)</span>
<span class="gd">- skb_reserve(skb, NET_IP_ALIGN);</span>
<span class="gd">- return skb;</span>
<span class="gd">-}</span>
<span class="gd">-</span>
static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
unsigned int length)
{
<span class="gd">--- a/net/Kconfig</span>
<span class="gi">+++ b/net/Kconfig</span>
<span class="gu">@@ -23,6 +23,12 @@ menuconfig NET</span>
if NET
<span class="gi">+config ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ bool</span>
<span class="gi">+ help</span>
<span class="gi">+ This option can be selected by phy drivers that need to mangle</span>
<span class="gi">+ packets going in or out of an ethernet device.</span>
<span class="gi">+</span>
config WANT_COMPAT_NETLINK_MESSAGES
bool
help
<span class="gd">--- a/net/core/dev.c</span>
<span class="gi">+++ b/net/core/dev.c</span>
<span class="gu">@@ -2530,9 +2530,19 @@ int dev_hard_start_xmit(struct sk_buff *</span>
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
<span class="gd">- skb_len = skb->len;</span>
<span class="gd">- rc = ops->ndo_start_xmit(skb, dev);</span>
<span class="gd">- trace_net_dev_xmit(skb, rc, dev, skb_len);</span>
<span class="gi">+#ifdef CONFIG_ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ if (!dev->eth_mangle_tx ||</span>
<span class="gi">+ (skb = dev->eth_mangle_tx(dev, skb)) != NULL)</span>
<span class="gi">+#else</span>
<span class="gi">+ if (1)</span>
<span class="gi">+#endif</span>
<span class="gi">+ {</span>
<span class="gi">+ skb_len = skb->len;</span>
<span class="gi">+ rc = ops->ndo_start_xmit(skb, dev);</span>
<span class="gi">+ trace_net_dev_xmit(skb, rc, dev, skb_len);</span>
<span class="gi">+ } else {</span>
<span class="gi">+ rc = NETDEV_TX_OK;</span>
<span class="gi">+ }</span>
if (rc == NETDEV_TX_OK)
txq_trans_update(txq);
return rc;
<span class="gu">@@ -2555,9 +2565,19 @@ gso:</span>
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(nskb, dev);
<span class="gd">- skb_len = nskb->len;</span>
<span class="gd">- rc = ops->ndo_start_xmit(nskb, dev);</span>
<span class="gd">- trace_net_dev_xmit(nskb, rc, dev, skb_len);</span>
<span class="gi">+#ifdef CONFIG_ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ if (!dev->eth_mangle_tx ||</span>
<span class="gi">+ (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL)</span>
<span class="gi">+#else</span>
<span class="gi">+ if (1)</span>
<span class="gi">+#endif</span>
<span class="gi">+ {</span>
<span class="gi">+ skb_len = nskb->len;</span>
<span class="gi">+ rc = ops->ndo_start_xmit(nskb, dev);</span>
<span class="gi">+ trace_net_dev_xmit(nskb, rc, dev, skb_len);</span>
<span class="gi">+ } else {</span>
<span class="gi">+ rc = NETDEV_TX_OK;</span>
<span class="gi">+ }</span>
if (unlikely(rc != NETDEV_TX_OK)) {
if (rc & ~NETDEV_TX_MASK)
goto out_kfree_gso_skb;
<span class="gd">--- a/net/core/skbuff.c</span>
<span class="gi">+++ b/net/core/skbuff.c</span>
<span class="gu">@@ -60,6 +60,7 @@</span>
#include <linux/scatterlist.h>
#include <linux/errqueue.h>
#include <linux/prefetch.h>
<span class="gi">+#include <linux/if.h></span>
#include <net/protocol.h>
#include <net/dst.h>
<span class="gu">@@ -444,6 +445,22 @@ struct sk_buff *__netdev_alloc_skb(struc</span>
}
EXPORT_SYMBOL(__netdev_alloc_skb);
<span class="gi">+struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev,</span>
<span class="gi">+ unsigned int length, gfp_t gfp)</span>
<span class="gi">+{</span>
<span class="gi">+ struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);</span>
<span class="gi">+</span>
<span class="gi">+#ifdef CONFIG_ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ if (dev->priv_flags & IFF_NO_IP_ALIGN)</span>
<span class="gi">+ return skb;</span>
<span class="gi">+#endif</span>
<span class="gi">+</span>
<span class="gi">+ if (NET_IP_ALIGN && skb)</span>
<span class="gi">+ skb_reserve(skb, NET_IP_ALIGN);</span>
<span class="gi">+ return skb;</span>
<span class="gi">+}</span>
<span class="gi">+EXPORT_SYMBOL(__netdev_alloc_skb_ip_align);</span>
<span class="gi">+</span>
void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
int size, unsigned int truesize)
{
<span class="gd">--- a/net/ethernet/eth.c</span>
<span class="gi">+++ b/net/ethernet/eth.c</span>
<span class="gu">@@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *sk</span>
struct ethhdr *eth;
skb->dev = dev;
<span class="gi">+</span>
<span class="gi">+#ifdef CONFIG_ETHERNET_PACKET_MANGLE</span>
<span class="gi">+ if (dev->eth_mangle_rx)</span>
<span class="gi">+ dev->eth_mangle_rx(dev, skb);</span>
<span class="gi">+#endif</span>
<span class="gi">+</span>
skb_reset_mac_header(skb);
skb_pull_inline(skb, ETH_HLEN);
eth = eth_hdr(skb);
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.25.1</a>) at 2025-03-26 19:32:37 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>