diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-01-10 17:59:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-10 17:59:34 -0500 |
| commit | 45593c2bd2d1e257d03d795f9c80e22e18f188f0 (patch) | |
| tree | 244bc6742cec283d828642adbec3e882e925a425 /net/batman-adv/bat_algo.h | |
| parent | Merge branch 'tcp_metrics_saddr' (diff) | |
| parent | batman-adv: set the isolation mark in the skb if needed (diff) | |
| download | linux-dev-45593c2bd2d1e257d03d795f9c80e22e18f188f0.tar.xz linux-dev-45593c2bd2d1e257d03d795f9c80e22e18f188f0.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- substitute FSF address with URL
- deselect current bat-GW when GW-client mode gets deactivated
- send every DHCP packet using bat-unicast messages when GW-client mode is
enabled
- implement the Extended Isolation mechanism (it is an enhancement of the
already existing batman-AP-isolation). This mechanism allows the user to drop
packets exchanged by selected clients by using netfilter marks.
- fix typ0 in header guard
- minor code cleanups
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bat_algo.h')
| -rw-r--r-- | net/batman-adv/bat_algo.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index a4808c29ea3d..92435bfc7471 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -12,9 +12,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BAT_ALGO_H_ |